- Add support for manually setting the adapter's network address

svn path=/branches/aicom-network-fixes/; revision=39995

COPYING

@@ -1,12 +1,13 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +16,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +56,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +111,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +169,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +226,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +256,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +278,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,9 +304,10 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -335,5 +337,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.

COPYING.LIB

@@ -1,504 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

COPYING3

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

COPYING3.LIB

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

CREDITS

@@ -9,21 +9,19 @@ Art Yerkes <ayerkes@speakeasy.net>
 Ariadne
 Brandon Turner <turnerb7@msu.edu>
 Brian Palmer <brianp@sginet.com>
-Cameron M. Gutman <cgutman@reactos.org>
 Casper S. Hornstrup <chorns@users.sourceforge.net>
 Christoph von Wittich <christoph_vw@reactos.org>
 Daniel Reimer <reimer.daniel@freenet.de>
 David Welch <welch@cwcom.net>
 Dmitry Chapyshev <dmitry@reactos.org>
 Emanuele Aliberti <ea@iol.it>
-Eric Kohl
+Eric Kohl <ekohl@rz-online.de>
 Eugene Ingerman <geneing@myrealbox.com>
 Filip Navara <xnavara@volny.cz>
 Frederik Leemans
 Ge van Geldorp <ge@gse.nl>
 Ged Murphy <gedmurphy@reactos.org>
 Gregor Brunmar <gregor brunmar at home se>
-Gregor Schneider <grschneider@gmail.com>
 Guido de Jong
 Gunnar Andre' Dalsnes <hardon@online.no>
 Hans Kremer
@@ -31,7 +29,7 @@ Hartmut Birr <hartmut.birr@gmx.de>
 Hernan Ochoa
 Herve Poussineau <hpoussin@reactos.com>
 Iwan Fatahi <i_fatahi@hotmail.com>
-James Tabor <james.tabor@reactos.org> <jimtabor.rosdev@gmail.com> <jamestabor_rosdev@yahoo.com>
+James B. Tabor <jimtabor.rosdev@gmail.com> <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
 Jason Eager
 Jason Filby <jasonfilby@yahoo.com>
 Jason Weiler
@@ -49,7 +47,6 @@ Mark Tempel <mtempel@visi.com>
 Mark Weaver <mark@npsl.co.uk>
 Martin Fuchs <martin-fuchs@gmx.net>
 Marty Dill <mdill@uvic.ca>
-Matthias Kupfer <mkupfer@reactos.org>
 Matt Pyne
 Mike Nordell <"tamlin">
 Nathan Woods <npwoods@mess.org>
@@ -63,10 +60,9 @@ Richard Campbell <betam4x@gmail.com>
 Robert Bergkvist <fragdance@hotmail.com>
 Robert Dickenson <robd@reactos.org>
 Royce Mitchell III <royce3@ev1.net>
-Samuel Serapi<70>n <samdwise51@gmail.com>
 Saveliy Tretiakov <saveliyt@mail.ru>
 Stefan Ginsberg <stefan__100__@hotmail.com>
-Steven Edwards <winehacker@gmail.com>
+Steven Edwards <steven_ed4153@yahoo.com>
 Thomas Weidenmueller <w3seek@users.sourceforge.net>
 Timo Kreuzer <timo.kreuzer@reactos.org>
 Victor Kirhenshtein <sauros@iname.com>

Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.6.2
+# Doxyfile 1.5.3
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -14,11 +14,11 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
@@ -31,14 +31,14 @@ PROJECT_NAME           = ReactOS
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = "ReactOS Source Code"
+PROJECT_NUMBER         = 
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = Doxygen
+OUTPUT_DIRECTORY       = doxy-doc
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -47,18 +47,17 @@ OUTPUT_DIRECTORY       = Doxygen
 # source files, where putting all generated files in the same directory would 
 # otherwise cause performance problems for the file system.
 
-CREATE_SUBDIRS         = YES
+CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
 # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
@@ -124,7 +123,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        = .
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
@@ -147,7 +146,7 @@ SHORT_NAMES            = NO
 # comments will behave just like regular Qt-style comments 
 # (thus requiring an explicit @brief command for a brief description.)
 
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
 
 # If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
 # interpret the first line (until the first dot) of a Qt-style 
@@ -165,22 +164,29 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = NO
+
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # re-implements.
 
-INHERIT_DOCS           = YES
+INHERIT_DOCS           = NO
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
 # a new page for each member. If set to NO, the documentation of a member will 
 # be part of the file/class/namespace that contains it.
 
-SEPARATE_MEMBER_PAGES  = YES
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 4
+TAB_SIZE               = 8
 
 # This tag can be used to specify a number of aliases that acts 
 # as commands in the documentation. An alias has the form "name=value". 
@@ -199,38 +205,14 @@ ALIASES                =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
+# sources only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses. 
-# With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
-# The format is ext=language, where ext is a file extension, and language is one of 
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set
-# FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING      = 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
 # set this tag to YES in order to let doxygen match functions declarations and 
 # definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
 # func(std::string) {}). This also make the inheritance and collaboration 
@@ -238,26 +220,11 @@ EXTENSION_MAPPING      =
 
 BUILTIN_STL_SUPPORT    = NO
 
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
 # tag is set to YES, then doxygen will reuse the documentation of the first 
 # member in the group (if any) for the other members of the group. By default 
@@ -273,32 +240,6 @@ DISTRIBUTE_GROUP_DOC   = NO
 
 SUBGROUPING            = YES
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = YES
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -333,11 +274,10 @@ EXTRACT_LOCAL_CLASSES  = YES
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
+# If this flag is set to YES, the members of anonymous namespaces will be extracted 
+# and appear in the documentation as a namespace called 'anonymous_namespace{file}', 
+# where file will be replaced with the base name of the file that contains the anonymous 
+# namespace. By default anonymous namespace are hidden.
 
 EXTRACT_ANON_NSPACES   = NO
 
@@ -375,7 +315,7 @@ HIDE_IN_BODY_DOCS      = NO
 # to NO (the default) then the documentation will be excluded. 
 # Set it to YES to include the internal documentation.
 
-INTERNAL_DOCS          = NO
+INTERNAL_DOCS          = YES
 
 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
 # file names in lower-case letters. If set to YES upper-case letters are also 
@@ -397,12 +337,6 @@ HIDE_SCOPE_NAMES       = NO
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
-# will list include files with double quotes in the documentation 
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES   = NO
-
 # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
 # is inserted in the documentation for inline members.
 
@@ -422,27 +356,11 @@ SORT_MEMBER_DOCS       = YES
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
 # sorted by fully-qualified names, including namespaces. If set to 
 # NO (the default), the class list will be sorted only by class name, 
 # not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
 # Note: This option applies only to the class list, not to the 
 # alphabetical list.
 
@@ -497,23 +415,11 @@ SHOW_USED_FILES        = YES
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES       = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = NO
+SHOW_DIRECTORIES       = NO
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
 # popen()) the command <command> <input-file>, where <command> is the value of 
 # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
 # provided by doxygen. Whatever the program writes to standard output 
@@ -521,15 +427,6 @@ SHOW_NAMESPACES        = NO
 
 FILE_VERSION_FILTER    = 
 
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
-# of the layout file.
-
-LAYOUT_FILE            = 
-
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -573,7 +470,7 @@ WARN_NO_PARAMDOC       = NO
 # $version, which will be replaced by the version of the file (if it could 
 # be obtained via FILE_VERSION_FILTER)
 
-WARN_FORMAT            = "$file:$line: $text"
+WARN_FORMAT            = "$file:$line: $text "
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning 
 # and error messages should be written. If left blank the output is written 
@@ -590,13 +487,12 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = 
+INPUT                  =
 
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
+# This tag can be used to specify the character encoding of the source files that 
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
 
@@ -605,18 +501,13 @@ INPUT_ENCODING         = UTF-8
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
 
 FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
                          *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.idl
+                         *.cpp \
+                         *.cc \
+                         *.cx
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 
@@ -628,7 +519,8 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                = subsystems/win32/win32k \
+                         base/shell/explorer
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
@@ -642,13 +534,12 @@ EXCLUDE_SYMLINKS       = NO
 # against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */.svn
+EXCLUDE_PATTERNS       = 
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
+# (namespaces, classes, functions, etc.) that should be excluded from the output. 
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        = 
 
@@ -663,14 +554,14 @@ EXAMPLE_PATH           =
 # and *.h) to filter out the source-files in the directories. If left 
 # blank all files are included.
 
-EXAMPLE_PATTERNS       = *
+EXAMPLE_PATTERNS       = 
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
 # searched for input files to be used with the \include or \dontinclude 
 # commands irrespective of the value of the RECURSIVE tag. 
 # Possible values are YES and NO. If left blank NO is used.
 
-EXAMPLE_RECURSIVE      = NO
+EXAMPLE_RECURSIVE      = YES
 
 # The IMAGE_PATH tag can be used to specify one or more files or 
 # directories that contain image that are included in the documentation (see 
@@ -710,7 +601,9 @@ FILTER_SOURCE_FILES    = NO
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
 # be generated. Documented entities will be cross-referenced with these sources. 
 # Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
+# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH 
+# then you must also enable this option. If you don't then doxygen will produce 
+# a warning and turn it on anyway
 
 SOURCE_BROWSER         = YES
 
@@ -725,22 +618,22 @@ INLINE_SOURCES         = YES
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES 
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES 
+# If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 
 # called/used by that function will be listed.
 
-REFERENCES_RELATION    = NO
+REFERENCES_RELATION    = YES
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code.  Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
 
 REFERENCES_LINK_SOURCE = YES
 
@@ -756,7 +649,7 @@ USE_HTAGS              = NO
 # will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
 
-VERBATIM_HEADERS       = NO
+VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
@@ -772,7 +665,7 @@ ALPHABETICAL_INDEX     = YES
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
 # in which this list will be split (can be a number in the range [1..20])
 
-COLS_IN_ALPHA_INDEX    = 3
+COLS_IN_ALPHA_INDEX    = 5
 
 # In case all classes in a project start with a common prefix, all 
 # classes will be put under the same header in the alphabetical index. 
@@ -806,13 +699,13 @@ HTML_FILE_EXTENSION    = .html
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            = Doxygen/header.html
+HTML_HEADER            = 
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = Doxygen/footer.html
+HTML_FOOTER            = 
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
@@ -823,18 +716,19 @@ HTML_FOOTER            = Doxygen/footer.html
 
 HTML_STYLESHEET        = 
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
-# page will contain the date and time when the page was generated. Setting 
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP         = NO
-
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
 
 HTML_ALIGN_MEMBERS     = YES
 
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
 # documentation will contain sections that can be hidden and shown after the 
 # page has loaded. For this to work a browser that supports 
@@ -843,39 +737,6 @@ HTML_ALIGN_MEMBERS     = YES
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
 # can add a path in front of the file if the result should not be 
@@ -896,12 +757,6 @@ HHC_LOCATION           =
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
-
-CHM_INDEX_ENCODING     = 
-
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
 # controls whether a binary table of contents is generated (YES) or a 
 # normal table of contents (NO) in the .chm file.
@@ -913,132 +768,32 @@ BINARY_TOC             = NO
 
 TOC_EXPAND             = NO
 
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
-# HTML documentation.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               = 
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
-# For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME   = 
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  = 
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS  = 
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file.
-
-QHG_LOCATION           = 
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
-# will be generated, which together with the HTML files, form an Eclipse help  
-# plugin. To install this plugin and make it available under the help contents 
-# menu in Eclipse, the contents of the directory containing the HTML and XML 
-# files needs to be copied into the plugins directory of eclipse. The name of 
-# the directory within the plugins directory should be the same as 
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin 
-# the directory name containing the HTML and XML files should also have 
-# this name.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
 
-DISABLE_INDEX          = YES
+DISABLE_INDEX          = NO
 
 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to YES, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
-# Windows users are probably better off using the HTML help feature.
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
 
 GENERATE_TREEVIEW      = NO
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES       = NO
-
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
 # used to set the initial width (in pixels) of the frame in which the tree 
 # is shown.
 
 TREEVIEW_WIDTH         = 250
 
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript 
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should 
-# typically be disabled. For large projects the javascript based search engine 
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index 
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvances is that it is more difficult to setup 
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH    = YES
-
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -1055,10 +810,7 @@ GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name. 
-# Note that when enabling USE_PDFLATEX this option is only used for 
-# generating bitmaps for formulas in the HTML output, but not in the 
-# Makefile that is written to the output directory.
+# invoked. If left blank `latex' will be used as the default command name.
 
 LATEX_CMD_NAME         = latex
 
@@ -1097,13 +849,13 @@ LATEX_HEADER           =
 # contain links (just like the HTML output) instead of page references 
 # This makes the output suitable for online browsing using a pdf viewer.
 
-PDF_HYPERLINKS         = YES
+PDF_HYPERLINKS         = NO
 
 # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
 # plain latex in the generated Makefile. Set this option to YES to get a 
 # higher quality PDF documentation.
 
-USE_PDFLATEX           = YES
+USE_PDFLATEX           = NO
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
 # command to the generated LaTeX files. This will instruct LaTeX to keep 
@@ -1118,13 +870,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE      = NO
-
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1145,7 +890,7 @@ RTF_OUTPUT             = rtf
 # RTF documents. This may be useful for small projects and may help to 
 # save some trees in general.
 
-COMPACT_RTF            = NO
+COMPACT_RTF            = YES
 
 # If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
 # will contain hyperlink fields. The RTF file will 
@@ -1154,7 +899,7 @@ COMPACT_RTF            = NO
 # programs which support those fields. 
 # Note: wordpad (write) and others do not support links.
 
-RTF_HYPERLINKS         = NO
+RTF_HYPERLINKS         = YES
 
 # Load stylesheet definitions from file. Syntax is similar to doxygen's 
 # config file, i.e. a series of assignments. You only have to provide 
@@ -1203,7 +948,7 @@ MAN_LINKS              = NO
 # generate an XML file that captures the structure of 
 # the code including all documentation.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -1276,14 +1021,14 @@ PERLMOD_PRETTY         = YES
 PERLMOD_MAKEVAR_PREFIX = 
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor   
 #---------------------------------------------------------------------------
 
 # If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
 # evaluate all C-preprocessor directives found in the sources and include 
 # files.
 
-ENABLE_PREPROCESSING   = YES
+ENABLE_PREPROCESSING   = NO
 
 # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
 # names in the source code. If set to NO (the default) only conditional 
@@ -1307,14 +1052,14 @@ SEARCH_INCLUDES        = YES
 # contain include files that are not input files but should be processed by 
 # the preprocessor.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           = include
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
 # patterns (like *.h and *.hpp) to filter out the header-files in the 
 # directories. If left blank, the patterns specified with FILE_PATTERNS will 
 # be used.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  = *.h
 
 # The PREDEFINED tag can be used to specify one or more macro names that 
 # are defined before the preprocessor is started (similar to the -D option of 
@@ -1342,7 +1087,7 @@ EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references   
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. 
@@ -1354,9 +1099,9 @@ SKIP_FUNCTION_MACROS   = YES
 #   TAGFILES = file1=loc1 "file2 = loc2" ... 
 # where "loc1" and "loc2" can be relative or absolute paths or 
 # URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
 # If a tag file is not located in the directory in which doxygen 
 # is run, you must also specify the path to the tagfile here.
 
@@ -1385,7 +1130,7 @@ EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool   
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
@@ -1398,11 +1143,10 @@ PERL_PATH              = /usr/bin/perl
 CLASS_DIAGRAMS         = NO
 
 # You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
+# be found in the default search path.
 
 MSCGEN_PATH            = 
 
@@ -1410,7 +1154,7 @@ MSCGEN_PATH            =
 # inheritance and usage relations if the target is undocumented 
 # or is not a class.
 
-HIDE_UNDOC_RELATIONS   = YES
+HIDE_UNDOC_RELATIONS   = NO
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
 # available from the path. This tool is part of Graphviz, a graph visualization 
@@ -1419,29 +1163,6 @@ HIDE_UNDOC_RELATIONS   = YES
 
 HAVE_DOT               = NO
 
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
-
-DOT_FONTNAME           = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
-
-DOT_FONTPATH           = 
-
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
 # indirect inheritance relations. Setting this tag to YES will force the 
@@ -1486,19 +1207,19 @@ INCLUDE_GRAPH          = YES
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
 
-CALL_GRAPH             = NO
+CALL_GRAPH             = YES
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
+# generate a caller dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable caller graphs for selected 
+# functions only using the \callergraph command.
 
 CALLER_GRAPH           = NO
 
@@ -1509,13 +1230,13 @@ GRAPHICAL_HIERARCHY    = YES
 
 # If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
 # then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
+# in a graphical way. The dependency relations are determined by the #include
 # relations between the files in the directories.
 
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif 
+# generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
 
 DOT_IMAGE_FORMAT       = png
@@ -1531,12 +1252,12 @@ DOT_PATH               =
 
 DOTFILE_DIRS           = 
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
 # nodes that will be shown in the graph. If the number of nodes in a graph 
 # becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# visualized by representing a node as a red box. Note that doxygen if the number 
+# of direct children of the root node in a graph is already larger than 
+# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note 
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
@@ -1549,13 +1270,13 @@ DOT_GRAPH_MAX_NODES    = 50
 # code bases. Also note that the size of a graph can be further restricted by 
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
-MAX_DOT_GRAPH_DEPTH    = 1000
+MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
 
 DOT_TRANSPARENT        = NO
 
@@ -1577,3 +1298,12 @@ GENERATE_LEGEND        = YES
 # the various graphs.
 
 DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO

LGPL.txt

@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

Makefile

@@ -46,10 +46,6 @@
 #        This is faster than the depends target which does a complete dependency
 #        check of the ReactOS codebase.
 #
-#    bootcdregtest
-#        This target builds an ISO (ReactOS-RegTest.ISO) which is used for unattended
-#        regression testing.
-#
 #
 # Accepted environment variables:
 #
@@ -116,17 +112,11 @@
 #        will go from 80 to 40MB, memory usage from 58 to 38MB and the install CD
 #        from 18 to 13MB. The variable defaults to no.
 #
-#    ROS_GENERATE_RSYM
-#        This variable controls generation of RSYM symbol data. The value can be
-#        either yes (to generate symbol data) or no. The variable defaults to yes.
-#
 #    ROS_RBUILDFLAGS
 #        Pass parameters to rbuild.
 #            -v           Be verbose.
 #            -c           Clean as you go. Delete generated files as soon as they are not needed anymore.
 #            -dd          Disable automatic dependencies.
-#            -da          Enable automatic dependencies.
-#            -df          Enable full dependencies.
 #            -dm{module}  Check only automatic dependencies for this module.
 #            -hd          Disable precompiled headers.
 #            -mi          Let make handle creation of install directories. Rbuild will not generate the directories.
@@ -156,11 +146,6 @@ $(error ReactOS's makefiles use GNU Make 3.80+ features, you have $(MAKE_VERSION
 endif
 # END of code borrowed from GMSL ( http://gmsl.sourceforge.net/ )
 
-define NL
-
-
-endef
-
 .PHONY: all
 .PHONY: clean
 .PHONY: world
@@ -173,7 +158,11 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-  ROS_AUTOMAKE=makefile-$(ARCH).auto
+  ifeq ($(ARCH),i386)
+    ROS_AUTOMAKE=makefile.auto
+  else
+    ROS_AUTOMAKE=makefile-$(ARCH).auto
+  endif
 endif
 
 all: $(ROS_AUTOMAKE)
@@ -225,29 +214,20 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_BUILDNO =@echo $(QUOTE)[BUILDNO]  $@$(QUOTE)
   ECHO_INVOKE  =@echo $(QUOTE)[INVOKE]   $<$(QUOTE)
   ECHO_PCH     =@echo $(QUOTE)[PCH]      $@$(QUOTE)
-  ECHO_CPP     =@echo $(QUOTE)[CPP]      $@$(QUOTE)
   ECHO_CC      =@echo $(QUOTE)[CC]       $<$(QUOTE)
-  ECHO_HOSTCC  =@echo $(QUOTE)[HOST-CC]  $<$(QUOTE)
-  ECHO_CL      =@echo $(QUOTE)[CL]       $<$(QUOTE)
-  ECHO_AS      =@echo $(QUOTE)[AS]       $<$(QUOTE)
+  ECHO_GAS     =@echo $(QUOTE)[GAS]      $<$(QUOTE)
   ECHO_NASM    =@echo $(QUOTE)[NASM]     $<$(QUOTE)
   ECHO_AR      =@echo $(QUOTE)[AR]       $@$(QUOTE)
-  ECHO_HOSTAR  =@echo $(QUOTE)[HOST-AR]  $@$(QUOTE)
   ECHO_WINEBLD =@echo $(QUOTE)[WINEBLD]  $@$(QUOTE)
   ECHO_WRC     =@echo $(QUOTE)[WRC]      $@$(QUOTE)
-  ECHO_RC      =@echo $(QUOTE)[RC]       $@$(QUOTE)
-  ECHO_CVTRES  =@echo $(QUOTE)[CVTRES]   $@$(QUOTE)
   ECHO_WIDL    =@echo $(QUOTE)[WIDL]     $@$(QUOTE)
   ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES]  $<$(QUOTE)
-  ECHO_IMPLIB  =@echo $(QUOTE)[IMPLIB]   $@$(QUOTE)
+  ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL]  $@$(QUOTE)
   ECHO_LD      =@echo $(QUOTE)[LD]       $@$(QUOTE)
-  ECHO_HOSTLD  =@echo $(QUOTE)[HOST-LD]  $@$(QUOTE)
-  ECHO_LINK    =@echo $(QUOTE)[LINK]     $@$(QUOTE)
   ECHO_NM      =@echo $(QUOTE)[NM]       $@$(QUOTE)
   ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP]  $@$(QUOTE)
   ECHO_RBUILD  =@echo $(QUOTE)[RBUILD]   $@$(QUOTE)
   ECHO_RSYM    =@echo $(QUOTE)[RSYM]     $@$(QUOTE)
-  ECHO_PEFIXUP =@echo $(QUOTE)[PEFIXUP]  $@$(QUOTE)
   ECHO_WMC     =@echo $(QUOTE)[WMC]      $@$(QUOTE)
   ECHO_NCI     =@echo $(QUOTE)[NCI]      $@$(QUOTE)
   ECHO_CABMAN  =@echo $(QUOTE)[CABMAN]   $<$(QUOTE)
@@ -258,30 +238,22 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_GENDIB  =@echo $(QUOTE)[GENDIB]   $@$(QUOTE)
   ECHO_STRIP   =@echo $(QUOTE)[STRIP]    $@$(QUOTE)
   ECHO_RGENSTAT=@echo $(QUOTE)[RGENSTAT] $@$(QUOTE)
-  ECHO_DEPENDS =@echo $(QUOTE)[DEPENDS]  $<$(QUOTE)
-  ECHO_RSP     =@echo $(QUOTE)[RSP]      $@$(QUOTE)
 else
   ECHO_CP      =
   ECHO_MKDIR   =
   ECHO_BUILDNO =
   ECHO_INVOKE  =
   ECHO_PCH     =
-  ECHO_CPP     =
   ECHO_CC      =
-  ECHO_HOSTCC  =
-  ECHO_AS      =
+  ECHO_GAS     =
   ECHO_NASM    =
   ECHO_AR      =
-  ECHO_HOSTAR  =
   ECHO_WINEBLD =
   ECHO_WRC     =
-  ECHO_RC      =
-  ECHO_CVTRES  =
   ECHO_WIDL    =
   ECHO_BIN2RES =
-  ECHO_IMPLIB  =
+  ECHO_DLLTOOL =
   ECHO_LD      =
-  ECHO_HOSTLD  =
   ECHO_NM      =
   ECHO_OBJDUMP =
   ECHO_RBUILD  =
@@ -296,8 +268,6 @@ else
   ECHO_GENDIB  =
   ECHO_STRIP   =
   ECHO_RGENSTAT=
-  ECHO_DEPENDS =
-  ECHO_RSP     =
 endif
 
 # Set host compiler/linker
@@ -331,7 +301,6 @@ ifeq ($(TARGET_CPP),)
 endif
 gcc = $(Q)$(TARGET_CC)
 gpp = $(Q)$(TARGET_CPP)
-gas = $(Q)$(TARGET_CC) -x assembler-with-cpp
 ld = $(Q)$(PREFIX_)ld
 nm = $(Q)$(PREFIX_)nm
 objdump = $(Q)$(PREFIX_)objdump
@@ -353,7 +322,6 @@ ifeq ($(HOST),mingw32-linux)
 	endif
 	export SEP = /
 	mkdir = -$(Q)mkdir -p
-	checkpoint = $(Q)touch
 	rm = $(Q)rm -f
 	cp = $(Q)cp
 	NUL = /dev/null
@@ -362,7 +330,6 @@ else # mingw32-windows
 	ROS_EMPTY =
 	export SEP = \$(ROS_EMPTY)
 	mkdir = -$(Q)mkdir
-	checkpoint = $(Q)copy /y NUL
 	rm = $(Q)del /f /q
 	cp = $(Q)copy /y
 	NUL = NUL
@@ -471,11 +438,19 @@ universe:
 		ROS_OUTPUT=output-$(ARCH)-r \
 		world
 
+sysregtest:
+	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg
+
 .PHONY: rgenstat
 rgenstat: $(RGENSTAT_TARGET)
 	$(ECHO_RGENSTAT)
 	$(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml
 
+.PHONY: cb
+cb: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb
+
 .PHONY: msbuild
 msbuild: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
@@ -526,11 +501,6 @@ msvc9: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
 	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc
 
-.PHONY: msvc10
-msvc10: $(ROS_BUILDENGINE)
-	$(ECHO_RBUILD)
-	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs10.00 -voversionconfiguration msvc
-
 .PHONY: msvc6_clean
 msvc6_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
@@ -556,11 +526,6 @@ msvc9_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
 	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc
 
-.PHONY: msvc10_clean
-msvc10_clean: $(ROS_BUILDENGINE)
-	$(ECHO_RBUILD)
-	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs10.00 -voversionconfiguration msvc
-
 .PHONY: msvc_clean
 msvc_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)

ReactOS-amd64.rbuild

@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true">
-	<xi:include href="config-amd64.rbuild">
-		<xi:fallback>
-			<xi:include href="config-amd64.template.rbuild" />
-		</xi:fallback>
-	</xi:include>
-
-	<xi:include href="ReactOS-generic.rbuild" />
-
-	<define name="_M_AMD64" />
-	<define name="_AMD64_" />
-	<define name="_M_AXP64" />
-	<define name="__x86_64__" />
-	<!-- define name="_X86AMD64_" / FIXME: what is this used for? -->
-	<define name="_WIN64" />
-	<define name="TARGET_amd64" host="true" />
-
-	<define name="USE_COMPILER_EXCEPTIONS" />
-
-	<property name="PLATFORM" value="PC"/>
-	<property name="usewrc" value="false"/>
-	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
-
-	<group compilerset="gcc">
-		<if property="OPTIMIZE" value="1">
-			<compilerflag>-ftracer</compilerflag>
-			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
-		</if>
-		<compilerflag>-fms-extensions</compilerflag>
-		<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
-		<compilerflag compiler="midl">-m64 --win64</compilerflag>
-		<!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag -->
-		<!-- compilerflag compiler="as">-gstabs+</compilerflag -->
-		<compilerflag>-U_X86_</compilerflag>
-		<compilerflag>-UWIN32</compilerflag>
-		<compilerflag>-Wno-format</compilerflag>
-	</group>
-
-	<group linkerset="ld">
-		<linkerflag>-disable-stdcall-fixup</linkerflag>
-		<linkerflag>-file-alignment=0x1000</linkerflag>
-		<linkerflag>-section-alignment=0x1000</linkerflag>
-		<linkerflag>--unique=.eh_frame</linkerflag>
-		<linkerflag>-static</linkerflag>
-		<linkerflag>--exclude-all-symbols</linkerflag>
-	</group>
-
-	<if property="USERMODE" value="1">
-		<directory name="base">
-			<directory name="applications">
-				<xi:include href="base/applications/applications.rbuild" />
-			</directory>
-			<directory name="services">
-				<xi:include href="base/services/services.rbuild" />
-			</directory>
-			<directory name="setup">
-				<xi:include href="base/setup/setup.rbuild" />
-			</directory>
-			<directory name="shell">
-				<directory name="cmd">
-					<xi:include href="base/shell/cmd/cmd.rbuild" />
-				</directory>
-				<directory name="explorer-new">
-					<xi:include href="base/shell/explorer-new/explorer.rbuild" />
-				</directory>
-			</directory>
-			<directory name="system">
-				<xi:include href="base/system/system.rbuild" />
-			</directory>
-		</directory>
-		<directory name="dll">
-			<xi:include href="dll/dll.rbuild" />
-		</directory>
-	</if>
-
-	<directory name="boot">
-		<xi:include href="boot/boot.rbuild" />
-	</directory>
-	<directory name="drivers">
-		<xi:include href="drivers/drivers.rbuild" />
-	</directory>
-	<directory name="hal">
-		<xi:include href="hal/hal.rbuild" />
-	</directory>
-	<directory name="include">
-		<xi:include href="include/directory.rbuild" />
-	</directory>
-	<directory name="lib">
-		<xi:include href="lib/lib.rbuild" />
-	</directory>
-	<directory name="media">
-		<xi:include href="media/media.rbuild" />
-	</directory>
-	<directory name="modules">
-		<xi:include href="modules/directory.rbuild" />
-	</directory>
-	<directory name="ntoskrnl">
-		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
-		<if property="BUILD_MP" value="1">
-			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
-		</if>
-	</directory>
-	<directory name="subsystems">
-		<xi:include href="subsystems/subsystems.rbuild" />
-	</directory>
-	<directory name="tools">
-		<xi:include href="tools/tools.rbuild" />
-	</directory>
-
-</project>

ReactOS-arm.rbuild

@@ -7,47 +7,74 @@
 		</xi:fallback>
 	</xi:include>
 
-    <xi:include href="ReactOS-generic.rbuild" />
+	<xi:include href="baseaddress.rbuild" />
 
-    <!-- <define name="_M_ARM" /> Already defined by toolchain -->
+	<define name="__REACTOS__" />
 	<define name="_ARM_" />
 	<define name="__arm__" />
-	<define name="TARGET_arm" host="true" />
 
-    <define name="USE_COMPILER_EXCEPTIONS" />
+	<if property="DBG" value="1">
+		<define name="DBG">1</define>
+		<define name="_SEH_ENABLE_TRACE" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	<if property="KDBG" value="1">
+		<define name="KDBG">1</define>
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	
+	<include>.</include>
+	<include>include</include>
+	<include root="intermediate">include</include>
+	<include>include/psdk</include>
+	<include root="intermediate">include/psdk</include>
+	<include>include/dxsdk</include>
+	<include root="intermediate">include/dxsdk</include>
+	<include>include/crt</include>
+	<include>include/crt/mingw32</include>
+	<include>include/ddk</include>
+	<include>include/GL</include>
+	<include>include/ndk</include>
+	<include>include/reactos</include>
+	<include root="intermediate">include/reactos</include>
+	<include root="intermediate">include/reactos/mc</include>
+	<include>include/reactos/libs</include>
+	<include>include/reactos/arm</include>
 
-    <property name="WINEBUILD_FLAGS" value="--kill-at"/>
-
-    <include>include/reactos/arm</include>
+	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
+	<property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/>
 
 	<if property="SARCH" value="versatile">
 		<define name="BOARD_CONFIG_VERSATILE"/>
 	</if>
 
-	<group compilerset="gcc">
-		<if property="OPTIMIZE" value="1">
-			<compilerflag>-ftracer</compilerflag>
-		</if>
-		<compilerflag>-fms-extensions</compilerflag>
-        <compilerflag>-Wno-attributes</compilerflag>
-        <compilerflag>-U_UNICODE</compilerflag>
-        <compilerflag>-UUNICODE</compilerflag>
-	</group>
-
-
-	<define name="__MSVCRT__"/> <!-- DUBIOUS -->
-
-	<group linkerset="ld">
-        <linkerflag>--strip-debug</linkerflag> <!-- INVESTIGATE -->
-        <linkerflag>-static</linkerflag> <!-- INVESTIGATE -->
-		<linkerflag>-file-alignment=0x1000</linkerflag>
-		<linkerflag>-section-alignment=0x1000</linkerflag>
-	</group>
+	<if property="OPTIMIZE" value="1">
+		<compilerflag>-Os</compilerflag>
+		<compilerflag>-ftracer</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="2">
+		<compilerflag>-Os</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="3">
+		<compilerflag>-O1</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="4">
+		<compilerflag>-O2</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="5">
+		<compilerflag>-O3</compilerflag>
+	</if>
 
+	<define name="__MSVCRT__"/>
+	<compilerflag>-Wno-attributes</compilerflag>
+	<compilerflag>-fno-strict-aliasing</compilerflag>
+	<linkerflag>-s</linkerflag>
+	<linkerflag>-static</linkerflag>
+	
 	<directory name="media">
 		<directory name="nls">
 			<xi:include href="media/nls/nls.rbuild" />
-		</directory>
+		</directory>	
 	</directory>
 	<directory name="lib">
 		<directory name="drivers">
@@ -74,9 +101,6 @@
 		<directory name="inflib">
 			<xi:include href="lib/inflib/inflib.rbuild" />
 		</directory>
-		<directory name="newinflib">
-			<xi:include href="lib/newinflib/inflib.rbuild" />
-		</directory>
 		<directory name="cmlib">
 			<xi:include href="lib/cmlib/cmlib.rbuild" />
 		</directory>
@@ -115,7 +139,17 @@
 		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
 	</directory>
 	<directory name="hal">
-		<xi:include href="hal/hal.rbuild" />
+		<directory name="halarm">
+			<directory name="generic">
+				<xi:include href="hal/halarm/generic/generic.rbuild" />
+			</directory>
+			<directory name="up">
+				<xi:include href="hal/halarm/up/halup.rbuild" />
+			</directory>
+		</directory>
+		<directory name="hal">
+			<xi:include href="hal/hal/hal.rbuild" />
+		</directory>
 	</directory>
 	<directory name="boot">
 		<xi:include href="boot/boot.rbuild" />
@@ -145,13 +179,13 @@
 	<directory name="dll">
 		<directory name="ntdll">
 			<xi:include href="dll/ntdll/ntdll.rbuild" />
-		</directory>
+		</directory>	
 	</directory>
 	<directory name="base">
 		<directory name="system">
             <directory name="smss">
                 <xi:include href="base/system/smss/smss.rbuild" />
-            </directory>
-		</directory>
+            </directory>	
+		</directory>	
 	</directory>
 </project>

ReactOS-generic.rbuild

@@ -4,65 +4,16 @@
 	<xi:include href="baseaddress.rbuild" />
 
 	<define name="__REACTOS__" />
-	<define name="__REACTOS__" host="true" />
-
 	<if property="DBG" value="1">
 		<define name="DBG">1</define>
 		<define name="_SEH_ENABLE_TRACE" />
 		<property name="DBG_OR_KDBG" value="true" />
 	</if>
-	<if property="DBG" value="0">
-		<define name="DBG">0</define>
-	</if>
-
 	<if property="KDBG" value="1">
 		<define name="KDBG">1</define>
 		<property name="DBG_OR_KDBG" value="true" />
 	</if>
 
-	<!-- The version target valid values are: Nt4 , NT5 , NT51 -->
-	<property name="VERSION_TARGET" value="NT52" />
-
-	<if property="VERSION_TARGET" value="NT4">
-		<define name="WINVER">0x400</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x400</define>
-		<define name="_WIN32_WINDOWS">0x400</define>
-		<define name="_SETUPAPI_VER">0x400</define>
-	</if>
-
-	<if property="VERSION_TARGET" value="NT5">
-		<define name="WINVER">0x500</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x500</define>
-		<define name="_WIN32_WINDOWS">0x500</define>
-		<define name="_SETUPAPI_VER">0x500</define>
-	</if>
-
-	<if property="VERSION_TARGET" value="NT51">
-		<define name="WINVER">0x501</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x501</define>
-		<define name="_WIN32_WINDOWS">0x501</define>
-		<define name="_SETUPAPI_VER">0x501</define>
-	</if>
-
-	<if property="VERSION_TARGET" value="NT52">
-		<define name="WINVER">0x502</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x502</define>
-		<define name="_WIN32_WINDOWS">0x502</define>
-		<define name="_SETUPAPI_VER">0x502</define>
-	</if>
-
-	<if property="VERSION_TARGET" value="NT6">
-		<define name="WINVER">0x600</define>
-		<define name="_WIN32_IE">0x600</define>
-		<define name="_WIN32_WINNT">0x600</define>
-		<define name="_WIN32_WINDOWS">0x600</define>
-		<define name="_SETUPAPI_VER">0x600</define>
-	</if>
-
 	<include>.</include>
 	<include>include</include>
 	<include root="intermediate">include</include>
@@ -71,8 +22,7 @@
 	<include>include/dxsdk</include>
 	<include root="intermediate">include/dxsdk</include>
 	<include>include/crt</include>
-	<include compilerset="gcc">include/crt/mingw32</include>
-	<include compilerset="msc">include/crt/msc</include>
+	<include>include/crt/mingw32</include>
 	<include>include/ddk</include>
 	<include>include/GL</include>
 	<include>include/ndk</include>
@@ -81,73 +31,42 @@
 	<include root="intermediate">include/reactos/mc</include>
 	<include>include/reactos/libs</include>
 
-	<include host="true">include</include>
-	<include host="true" root="intermediate">include</include>
-	<include host="true">include/reactos</include>
-	<include host="true">include/reactos/wine</include>
-
-	<group compilerset="gcc">
-		<compilerflag>-Wall</compilerflag>
-		<compilerflag>-Wno-char-subscripts</compilerflag>
-		<compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
-	</group>
-
-	<group compilerset="msc">
-		<define name="inline" compiler="cc">__inline</define>
-		<define name="__STDC__" compiler="cc">1</define>
-		<compilerflag>/Zl</compilerflag>
-		<compilerflag>/Zi</compilerflag>
-		<compilerflag>/W1</compilerflag>
-	</group>
-
-	<group compilerset="gcc">
-		<if property="OPTIMIZE" value="1">
-			<compilerflag>-Os</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="2">
-			<compilerflag>-Os</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="3">
-			<compilerflag>-O1</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="4">
-			<compilerflag>-O2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="5">
-			<compilerflag>-O3</compilerflag>
-		</if>
-
-		<compilerflag>-fno-strict-aliasing</compilerflag>
-		<compilerflag>-Wpointer-arith</compilerflag>
-		<compilerflag>-Wno-multichar</compilerflag>
-		<compilerflag>-Wno-error=uninitialized</compilerflag>
-		<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
-	</group>
-
-	<group compilerset="msc">
-		<if property="OPTIMIZE" value="1">
-			<compilerflag>/O1</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="2">
-			<compilerflag>/O2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="3">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Ot</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="4">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Os</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="5">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Os</compilerflag>
-			<compilerflag>/Ob2</compilerflag>
-			<compilerflag>/GF</compilerflag>
-			<compilerflag>/Gy</compilerflag>
-		</if>
-
-		<compilerflag>/GS-</compilerflag>
-	</group>
+	<directory name="base">
+		<xi:include href="base/base.rbuild" />
+	</directory>
+	<directory name="boot">
+		<xi:include href="boot/boot.rbuild" />
+	</directory>
+	<directory name="dll">
+		<xi:include href="dll/dll.rbuild" />
+	</directory>
+	<directory name="drivers">
+		<xi:include href="drivers/drivers.rbuild" />
+	</directory>
+	<directory name="hal">
+		<xi:include href="hal/hal.rbuild" />
+	</directory>
+	<directory name="include">
+		<xi:include href="include/directory.rbuild" />
+	</directory>
+	<directory name="lib">
+		<xi:include href="lib/lib.rbuild" />
+	</directory>
+	<directory name="media">
+		<xi:include href="media/media.rbuild" />
+	</directory>
+	<directory name="modules">
+		<xi:include href="modules/directory.rbuild" />
+	</directory>
+	<directory name="ntoskrnl">
+		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
+		<!-- <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> -->
+	</directory>
+	<directory name="subsystems">
+		<xi:include href="subsystems/subsystems.rbuild" />
+	</directory>
+	<directory name="tools">
+		<xi:include href="tools/tools.rbuild" />
+	</directory>
 
 </group>

ReactOS-i386.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config.rbuild">
 		<xi:fallback>
 			<xi:include href="config.template.rbuild" />
@@ -12,70 +12,31 @@
 	<define name="_M_IX86" />
 	<define name="_X86_" />
 	<define name="__i386__" />
-	<define name="TARGET_i386" host="true" />
 
-	<define name="USE_COMPILER_EXCEPTIONS" />
-	<define name="_USE_32BIT_TIME_T" />
+	<property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/>
 
-	<property name="PLATFORM" value="PC"/>
+	<if property="OPTIMIZE" value="1">
+		<compilerflag>-Os</compilerflag>
+		<compilerflag>-ftracer</compilerflag>
+		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="2">
+		<compilerflag>-Os</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="3">
+		<compilerflag>-O1</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="4">
+		<compilerflag>-O2</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="5">
+		<compilerflag>-O3</compilerflag>
+	</if>
 
-	<group compilerset="gcc">
-		<if property="OPTIMIZE" value="1">
-			<compilerflag>-ftracer</compilerflag>
-			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
-		</if>
-		<compilerflag>-fms-extensions</compilerflag>
-		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		<compilerflag compiler="midl">-m32 --win32</compilerflag>
-		<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
-		<compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag>
-		<compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag>
-		<compilerflag compiler="as">-gstabs+</compilerflag>
-	</group>
+	<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+	<compilerflag>-fno-strict-aliasing</compilerflag>
+	<compilerflag>-Wno-strict-aliasing</compilerflag>
+	<compilerflag>-Wpointer-arith</compilerflag>
+	<linkerflag>-enable-stdcall-fixup</linkerflag>
 
-	<group linkerset="ld">
-		<linkerflag>-disable-stdcall-fixup</linkerflag>
-		<linkerflag>-file-alignment=0x1000</linkerflag>
-		<linkerflag>-section-alignment=0x1000</linkerflag>
-	</group>
-
-	<directory name="base">
-		<xi:include href="base/base.rbuild" />
-	</directory>
-	<directory name="boot">
-		<xi:include href="boot/boot.rbuild" />
-	</directory>
-	<directory name="dll">
-		<xi:include href="dll/dll.rbuild" />
-	</directory>
-	<directory name="drivers">
-		<xi:include href="drivers/drivers.rbuild" />
-	</directory>
-	<directory name="hal">
-		<xi:include href="hal/hal.rbuild" />
-	</directory>
-	<directory name="include">
-		<xi:include href="include/directory.rbuild" />
-	</directory>
-	<directory name="lib">
-		<xi:include href="lib/lib.rbuild" />
-	</directory>
-	<directory name="media">
-		<xi:include href="media/media.rbuild" />
-	</directory>
-	<directory name="modules">
-		<xi:include href="modules/directory.rbuild" />
-	</directory>
-	<directory name="ntoskrnl">
-		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
-		<if property="BUILD_MP" value="1">
-			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
-		</if>
-	</directory>
-	<directory name="subsystems">
-		<xi:include href="subsystems/subsystems.rbuild" />
-	</directory>
-	<directory name="tools">
-		<xi:include href="tools/tools.rbuild" />
-	</directory>
 </project>

ReactOS-ppc.rbuild

@@ -20,6 +20,4 @@
 	<compilerflag>-meabi</compilerflag>
 	<compilerflag>-O2</compilerflag>
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
-	<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
-	<compilerflag compiler="as">-gstabs+</compilerflag>
 </project>

base/applications/applications.rbuild

@@ -16,39 +16,26 @@
 	<directory name="control">
 		<xi:include href="control/control.rbuild" />
 	</directory>
-	<directory name="downloader">
-		<xi:include href="downloader/downloader.rbuild" />
-	</directory>	
 	<directory name="dxdiag">
 		<xi:include href="dxdiag/dxdiag.rbuild" />
 	</directory>
-	<directory name="extrac32">
-		<xi:include href="extrac32/extrac32.rbuild" />
-	</directory>
-	<directory name="fontview">
-		<xi:include href="fontview/fontview.rbuild" />
-	</directory>
 	<directory name="games">
 		<xi:include href="games/games.rbuild" />
 	</directory>
 	<directory name="hh">
 		<xi:include href="hh/hh.rbuild" />
 	</directory>
+<!--
 	<directory name="iexplore">
 		<xi:include href="iexplore/iexplore.rbuild" />
 	</directory>
+-->
 	<directory name="kbswitch">
 		<xi:include href="kbswitch/kbswitch.rbuild" />
 	</directory>
 	<directory name="logoff">
 		<xi:include href="logoff/logoff.rbuild" />
 	</directory>
-	<directory name="magnify">
-		<xi:include href="magnify/magnify.rbuild" />
-	</directory>
-	<directory name="mplay32">
-		<xi:include href="mplay32/mplay32.rbuild" />
-	</directory>
 	<directory name="msconfig">
 		<xi:include href="msconfig/msconfig.rbuild" />
 	</directory>
@@ -64,9 +51,6 @@
 	<directory name="notepad">
 		<xi:include href="notepad/notepad.rbuild" />
 	</directory>
-	<directory name="paint">
-		<xi:include href="paint/paint.rbuild" />
-	</directory>
 	<directory name="regedit">
 		<xi:include href="regedit/regedit.rbuild" />
 	</directory>
@@ -82,9 +66,6 @@
 	<directory name="shutdown">
 		<xi:include href="shutdown/shutdown.rbuild" />
 	</directory>
-	<directory name="sndrec32">
-		<xi:include href="sndrec32/sndrec32.rbuild" />
-	</directory>
 	<directory name="sndvol32">
 		<xi:include href="sndvol32/sndvol32.rbuild" />
 	</directory>
@@ -94,16 +75,7 @@
 	<directory name="winhlp32">
 		<xi:include href="winhlp32/winhlp32.rbuild" />
 	</directory>
-	<directory name="winver">
-		<xi:include href="winver/winver.rbuild" />
-	</directory>
 	<directory name="wordpad">
 		<xi:include href="wordpad/wordpad.rbuild" />
 	</directory>
-	<directory name="write">
-		<xi:include href="write/write.rbuild" />
-	</directory>
-	<directory name="rapps">
-		<xi:include href="rapps/rapps.rbuild" />
-	</directory>
 </group>

base/applications/cacls/cacls.c

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <precomp.h>
@@ -28,8 +28,7 @@ static GENERIC_MAPPING FileGenericMapping =
 };
 
 
-static
-INT
+static INT
 LengthOfStrResource(IN HINSTANCE hInst,
                     IN UINT uID)
 {
@@ -73,8 +72,7 @@ LengthOfStrResource(IN HINSTANCE hInst,
 }
 
 
-static
-INT
+static INT
 AllocAndLoadString(OUT LPTSTR *lpTarget,
                    IN HINSTANCE hInst,
                    IN UINT uID)
@@ -108,8 +106,7 @@ AllocAndLoadString(OUT LPTSTR *lpTarget,
 }
 
 
-static
-VOID
+static VOID
 PrintHelp(VOID)
 {
     LPTSTR szHelp;
@@ -128,8 +125,7 @@ PrintHelp(VOID)
 }
 
 
-static
-VOID
+static VOID
 PrintErrorMessage(IN DWORD dwError)
 {
     LPTSTR szError;
@@ -152,8 +148,7 @@ PrintErrorMessage(IN DWORD dwError)
 }
 
 
-static
-DWORD
+static DWORD
 LoadAndPrintString(IN HINSTANCE hInst,
                    IN UINT uID)
 {
@@ -175,19 +170,18 @@ LoadAndPrintString(IN HINSTANCE hInst,
 }
 
 
-static
-BOOL
+static BOOL
 PrintFileDacl(IN LPTSTR FilePath,
               IN LPTSTR FileName)
 {
-    SIZE_T Length;
+    SIZE_T Indent;
     PSECURITY_DESCRIPTOR SecurityDescriptor;
     DWORD SDSize = 0;
     TCHAR FullFileName[MAX_PATH + 1];
     BOOL Error = FALSE, Ret = FALSE;
 
-    Length = _tcslen(FilePath) + _tcslen(FileName);
-    if (Length > MAX_PATH)
+    Indent = _tcslen(FilePath) + _tcslen(FileName);
+    if (Indent++ > MAX_PATH - 1)
     {
         /* file name too long */
         SetLastError(ERROR_FILE_NOT_FOUND);
@@ -513,9 +507,7 @@ PrintSpecialAccess:
 }
 
 
-int
-__cdecl
-_tmain(int argc, const TCHAR *argv[])
+int __cdecl _tmain(int argc, const TCHAR *argv[])
 {
     if (argc < 2)
     {
@@ -529,6 +521,7 @@ _tmain(int argc, const TCHAR *argv[])
         WIN32_FIND_DATA FindData;
         HANDLE hFind;
         DWORD LastError;
+        BOOL ContinueAccessDenied = FALSE;
 
         if (argc > 2)
         {
@@ -571,7 +564,8 @@ _tmain(int argc, const TCHAR *argv[])
                         {
                             LastError = GetLastError();
 
-                            if (LastError == ERROR_ACCESS_DENIED)
+                            if (LastError == ERROR_ACCESS_DENIED &&
+                                ContinueAccessDenied)
                             {
                                 PrintErrorMessage(LastError);
                             }

base/applications/cacls/cacls.rbuild

@@ -2,6 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" unicode="true">
 	<include base="cacls">.</include>
+	<define name="_WIN32_IE">0x0500</define>
+	<define name="_WIN32_WINNT">0x0600</define>
+	<define name="WINVER">0x0600</define>
+	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ntdll</library>
 	<library>user32</library>

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

@@ -7,17 +7,17 @@ IDS_HELP, "Affiche ou change la liste des contr
 CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
                [/P user:perm [...]] [/D user [...]]\n\
    nomfichier    Affiche les ACLs du fichier.\n\
-   /T            Change les ACLs des fichiers sp<EFBFBD>cifi<EFBFBD>s dans\n\
+   /T            Change les ACLs des fichiers specifi<EFBFBD>s dans\n\
                  le r<>pertoire en cours et tous les sous-r<>pertoires.\n\
    /E            <20>dite les ACL au lieu de les remplacer.\n\
    /C            Continuer en cas de refus d'acc<63>s.\n\
-   /G user:perm  Accorder des droits d'acc<63>s <20> l'utilisateur sp<73>cifi<66>.\n\
+   /G user:perm  Accorder des droit d'acc<63>s <20> l'utilisateur sp<73>cifi<66>.\n\
                  Perm peut valoir : R  Lecture\n\
                                     W  <20>criture\n\
                                     C  Modification (<28>criture)\n\
                                     F  Contr<74>le total\n\
    /R user       Supprime les droits d'acc<63>s de l'utilisateur sp<73>cifi<66> (valide uniquement avec /E).\n\
-   /P user:perm  Remplace les droits d'acc<63>s de l'utilisateur sp<EFBFBD>cifi<EFBFBD>.\n\
+   /P user:perm  Remplace les droits d'acc<63>s de l'utilisateur specifi<EFBFBD>.\n\
                  Perm peut valoir : N  Aucun \n\
                                     R  Lecture\n\
                                     W  <20>criture\n\
@@ -27,11 +27,11 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
 Il est possible d'utiliser des caract<63>res joker pour s<>lectionner plus d'un fichier avec une commande.\n\
 Il est possible de sp<73>cifier plus d'un utilisateur dans une commande.\n\n\
 Abr<EFBFBD>viations:\n\
-   CI - H<EFBFBD>ritage du conteneur.\n\
+   CI - Heritage du conteneur.\n\
         Le ACE sera appliqu<71> aux r<>pertoires.\n\
    OI - H<>ritage de l'objet.\n\
         Le ACE sera appliqu<71> aux fichiers.\n\
-   IO - H<EFBFBD>ritage seul.\n\
+   IO - Heritage seul.\n\
         Le ACE ne sera pas appliqu<71> au fichier/r<>pertoire actuel.\n"
 
 IDS_ABBR_CI, "(CI)"

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

@@ -1,78 +0,0 @@
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "<22>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD>䃊<EFBFBD>X<EFBFBD>g(ACL) <20><><EFBFBD>\\<5C><><EFBFBD>܂<EFBFBD><DC82>͕ύX<CF8D><58><EFBFBD>܂<EFBFBD><DC82>B\n\n\
-CACLS <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD> [/T] [/E] [/C] [/G <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>:<3A>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>]\n\
-                 [/R <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><> [...]] [/P <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>:<3A>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58> [...]]\n\
-                 [/D <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><> [...]]\n\
-  <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD>        ACL <20><><EFBFBD>\\<5C><><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
-  /T                <20><><EFBFBD>݂̃f<CC83>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>Ƃ<EFBFBD><C682>ׂẴT<CC83>u<EFBFBD>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>ɂ<EFBFBD><C982><EFBFBD>\n\
-                    <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD> ACL <20><><EFBFBD>ύX<CF8D><58><EFBFBD>܂<EFBFBD><DC82>B\n\
-  /E                ACL <20><><EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɁAACL <20><><EFBFBD>ҏW<D28F><57><EFBFBD>܂<EFBFBD><DC82>B\n\
-  /C                <20>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD>ۃG<DB83><47><EFBFBD>[<5B>𖳎<EFBFBD><F096B38E><EFBFBD><EFBFBD>āAACL <20>̕ύX<CF8D>𑱍s<F091B18D><73><EFBFBD>܂<EFBFBD><DC82>B\n\
-  /G <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>:<3A>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>\n\
-                    <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>[<5B>U<EFBFBD>[<5B>ɃA<C983>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD>^<5E><><EFBFBD>܂<EFBFBD><DC82>B\n\
-                    <20>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>: R  <20>ǂݎ<C782><DD8E><EFBFBD>\n\
-                                W  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                                C  <20>ύX (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)\n\
-                                F  <20>t<EFBFBD><74> <20>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><>\n\
-  /R <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>     <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>[<5B>U<EFBFBD>[<5B>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
-                    (/E <20>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>Ƌ<EFBFBD><C68B>Ɏg<C98E>p)<29>B\n\
-  /P <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>:<3A>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>\n\
-                    <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>[<5B>U<EFBFBD>[<5B>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
-                    <20>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>: N  <20>Ȃ<EFBFBD>\n\
-                                W  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                                R  <20>ǂݎ<C782><DD8E><EFBFBD>\n\
-                                C  <20>ύX (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)\n\
-                                F  <20>t<EFBFBD><74> <20>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><>\n\
-  /D <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>     <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>[<5B>U<EFBFBD>[<5B>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD>ۂ<EFBFBD><DB82>܂<EFBFBD><DC82>B\n\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>肷<EFBFBD><E882B7><EFBFBD>ɂ́A<CD81><41><EFBFBD>C<EFBFBD><43><EFBFBD>h<EFBFBD>J<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>g<EFBFBD>p<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82>B\n\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃<EFBFBD><EFBFBD>[<5B>U<EFBFBD>[<5B><><EFBFBD>w<EFBFBD><77><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82>B\n\n\
-<EFBFBD>ȗ<EFBFBD><EFBFBD>`:\n\
-   CI - <20>R<EFBFBD><52><EFBFBD>e<EFBFBD>i<EFBFBD>p<EFBFBD><70><EFBFBD>B\n\
-        ACE <20>̓f<CD83>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>Ɍp<C98C><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
-   OI - <20>I<EFBFBD>u<EFBFBD>W<EFBFBD>F<EFBFBD>N<EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD>B\n\
-        ACE <20>̓t<CD83>@<40>C<EFBFBD><43><EFBFBD>Ɍp<C98C><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
-   IO - <20>p<EFBFBD><70><EFBFBD>̂݁B\n\
-        ACE <20>͌<EFBFBD><CD8C>݂̃t<CC83>@<40>C<EFBFBD><43>/<2F>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>ɓK<C993>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B\n"
-
-IDS_ABBR_CI, "(CI)"
-IDS_ABBR_OI, "(OI)"
-IDS_ABBR_IO, "(IO)"
-IDS_ABBR_FULL, "F"
-IDS_ABBR_READ, "R"
-IDS_ABBR_WRITE, "W"
-IDS_ABBR_CHANGE, "C"
-IDS_ABBR_NONE, "N"
-IDS_ALLOW, ""
-IDS_DENY, "(DENY)"
-IDS_SPECIAL_ACCESS, "(special access:)"
-IDS_GENERIC_READ, "GENERIC_READ"
-IDS_GENERIC_WRITE, "GENERIC_WRITE"
-IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
-IDS_GENERIC_ALL, "GENERIC_ALL"
-IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
-IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
-IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
-IDS_FILE_READ_DATA, "FILE_READ_DATA"
-IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
-IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
-IDS_FILE_READ_EA, "FILE_READ_EA"
-IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
-IDS_FILE_EXECUTE, "FILE_EXECUTE"
-IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
-IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
-IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
-IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
-IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
-IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
-IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
-IDS_SYNCHRONIZE, "SYNCHRONIZE"
-IDS_WRITE_OWNER, "WRITE_OWNER"
-IDS_WRITE_DAC, "WRITE_DAC"
-IDS_READ_CONTROL, "READ_CONTROL"
-IDS_DELETE, "DELETE"
-IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-END

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

@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

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

@@ -1,95 +1,95 @@
-/*
- *  cacls (TRADITIONAL Chinese resources)
- *  (<28>c<EFBFBD>餤<EFBFBD><E9A4A4><EFBFBD>귽)
- *  Copyright 2007 jauming <jauming.tw@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "<22><><EFBFBD>ܩΪ̭ק<CCAD><D7A7><EFBFBD><EFBFBD>󪺳X<F3AABAB3>ݱ<EFBFBD><DDB1><EFBFBD><EFBFBD><EFBFBD> \n\n\
-CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
-               [/P user:perm [...]] [/D user [...]]\n\
-   filename      <20><><EFBFBD><EFBFBD> ACLs<4C>C\n\
-   /T            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>ؿ<EFBFBD><D8BF>Ψ<EFBFBD><CEA8>Ҧ<EFBFBD><D2A6>l<EFBFBD>ؿ<EFBFBD><D8BF><EFBFBD>\n\
-                 <20><><EFBFBD>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ACL<43>C\n\
-   /E            <20>s<EFBFBD><73> ACL <20>Ӥ<EFBFBD><D3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n\
-   /C            <20>b<EFBFBD>X<EFBFBD>{<7B>ڵ<EFBFBD><DAB5>X<EFBFBD>ݿ<EFBFBD><DDBF>~<7E><><EFBFBD>~<7E><><EFBFBD>C\n\
-   /G user:perm  <20>ᤩ<EFBFBD><E1A4A9><EFBFBD>w<EFBFBD>Τ<EFBFBD><CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76><EFBFBD>C\n\
-                 Perm <20>i<EFBFBD>H<EFBFBD>O: R  Ū<><C5AA> \n\
-                              W  <20>g<EFBFBD>J \n\
-                              C  <20><><EFBFBD><EFBFBD>(<28>g<EFBFBD>J) \n\
-                              F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
-   /R user       <20>M<EFBFBD>P<EFBFBD><50><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76>(<28>Ȧb<C8A6>O /E <20>@<40>_<EFBFBD>ϥήɦX<C9A6>k)<29>C\n\
-   /P user:perm  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76><EFBFBD>C\n\
-                 Perm <20>i<EFBFBD>H<EFBFBD>O: N  <20>L \n\
-                              R  Ū<><C5AA> \n\
-                              W  <20>g<EFBFBD>J \n\
-                              C  <20><><EFBFBD><EFBFBD>(<28>g<EFBFBD>J) \n\
-                              F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
-   /D user       <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD>ݡC\n\
-<EFBFBD>b<EFBFBD>R<EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>H<EFBFBD>ϥγq<EFBFBD>t<EFBFBD>ū<EFBFBD><EFBFBD>w<EFBFBD>h<EFBFBD>Ӥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n\
-<EFBFBD>z<EFBFBD>]<5D>i<EFBFBD>H<EFBFBD>b<EFBFBD>R<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>h<EFBFBD>ӥΤ<D3A5><CEA4>C\n\n\
-<EFBFBD>Y<EFBFBD>g: \n\
-   CI - <20>e<EFBFBD><65><EFBFBD>~<7E>ӡC\n\
-        ACE<43>|<7C>ѥؿ<D1A5><D8BF>~<7E>ӡC\n\
-   OI - <20><><EFBFBD>H<EFBFBD>~<7E>ӡC\n\
-        ACE <20>|<7C>Ѥ<EFBFBD><D1A4><EFBFBD><EFBFBD>~<7E>ӡC\n\
-   IO - <20>u<EFBFBD>~<7E>ӡC\n\
-        ACE <20><><EFBFBD>A<EFBFBD>Ω<EFBFBD><CEA9><EFBFBD><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD>/<2F>ؿ<EFBFBD><D8BF>C\n"
-
-IDS_ABBR_CI, "(CI)"
-IDS_ABBR_OI, "(OI)"
-IDS_ABBR_IO, "(IO)"
-IDS_ABBR_FULL, "F"
-IDS_ABBR_READ, "R"
-IDS_ABBR_WRITE, "W"
-IDS_ABBR_CHANGE, "C"
-IDS_ABBR_NONE, "N"
-IDS_ALLOW, ""
-IDS_DENY, "(DENY)"
-IDS_SPECIAL_ACCESS, "(special access:)"
-IDS_GENERIC_READ, "GENERIC_READ"
-IDS_GENERIC_WRITE, "GENERIC_WRITE"
-IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
-IDS_GENERIC_ALL, "GENERIC_ALL"
-IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
-IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
-IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
-IDS_FILE_READ_DATA, "FILE_READ_DATA"
-IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
-IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
-IDS_FILE_READ_EA, "FILE_READ_EA"
-IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
-IDS_FILE_EXECUTE, "FILE_EXECUTE"
-IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
-IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
-IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
-IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
-IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
-IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
-IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
-IDS_SYNCHRONIZE, "SYNCHRONIZE"
-IDS_WRITE_OWNER, "WRITE_OWNER"
-IDS_WRITE_DAC, "WRITE_DAC"
-IDS_READ_CONTROL, "READ_CONTROL"
-IDS_DELETE, "DELETE"
-IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-END
+/*
+ *  cacls (TRADITIONAL Chinese resources)
+ *  (<28>c<EFBFBD>餤<EFBFBD><E9A4A4><EFBFBD>귽)
+ *  Copyright 2007 jauming <jauming.tw@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
+
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "<22><><EFBFBD>ܩΪ̭ק<CCAD><D7A7><EFBFBD><EFBFBD>󪺳X<F3AABAB3>ݱ<EFBFBD><DDB1><EFBFBD><EFBFBD><EFBFBD> \n\n\
+CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
+               [/P user:perm [...]] [/D user [...]]\n\
+   filename      <20><><EFBFBD><EFBFBD> ACLs<4C>C\n\
+   /T            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>ؿ<EFBFBD><D8BF>Ψ<EFBFBD><CEA8>Ҧ<EFBFBD><D2A6>l<EFBFBD>ؿ<EFBFBD><D8BF><EFBFBD>\n\
+                 <20><><EFBFBD>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ACL<43>C\n\
+   /E            <20>s<EFBFBD><73> ACL <20>Ӥ<EFBFBD><D3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n\
+   /C            <20>b<EFBFBD>X<EFBFBD>{<7B>ڵ<EFBFBD><DAB5>X<EFBFBD>ݿ<EFBFBD><DDBF>~<7E><><EFBFBD>~<7E><><EFBFBD>C\n\
+   /G user:perm  <20>ᤩ<EFBFBD><E1A4A9><EFBFBD>w<EFBFBD>Τ<EFBFBD><CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76><EFBFBD>C\n\
+                 Perm <20>i<EFBFBD>H<EFBFBD>O: R  Ū<><C5AA> \n\
+                              W  <20>g<EFBFBD>J \n\
+                              C  <20><><EFBFBD><EFBFBD>(<28>g<EFBFBD>J) \n\
+                              F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
+   /R user       <20>M<EFBFBD>P<EFBFBD><50><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76>(<28>Ȧb<C8A6>O /E <20>@<40>_<EFBFBD>ϥήɦX<C9A6>k)<29>C\n\
+   /P user:perm  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76><EFBFBD>C\n\
+                 Perm <20>i<EFBFBD>H<EFBFBD>O: N  <20>L \n\
+                              R  Ū<><C5AA> \n\
+                              W  <20>g<EFBFBD>J \n\
+                              C  <20><><EFBFBD><EFBFBD>(<28>g<EFBFBD>J) \n\
+                              F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
+   /D user       <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD>ݡC\n\
+<EFBFBD>b<EFBFBD>R<EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>H<EFBFBD>ϥγq<EFBFBD>t<EFBFBD>ū<EFBFBD><EFBFBD>w<EFBFBD>h<EFBFBD>Ӥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n\
+<EFBFBD>z<EFBFBD>]<5D>i<EFBFBD>H<EFBFBD>b<EFBFBD>R<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>h<EFBFBD>ӥΤ<D3A5><CEA4>C\n\n\
+<EFBFBD>Y<EFBFBD>g: \n\
+   CI - <20>e<EFBFBD><65><EFBFBD>~<7E>ӡC\n\
+        ACE<43>|<7C>ѥؿ<D1A5><D8BF>~<7E>ӡC\n\
+   OI - <20><><EFBFBD>H<EFBFBD>~<7E>ӡC\n\
+        ACE <20>|<7C>Ѥ<EFBFBD><D1A4><EFBFBD><EFBFBD>~<7E>ӡC\n\
+   IO - <20>u<EFBFBD>~<7E>ӡC\n\
+        ACE <20><><EFBFBD>A<EFBFBD>Ω<EFBFBD><CEA9><EFBFBD><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD>/<2F>ؿ<EFBFBD><D8BF>C\n"
+
+IDS_ABBR_CI, "(CI)"
+IDS_ABBR_OI, "(OI)"
+IDS_ABBR_IO, "(IO)"
+IDS_ABBR_FULL, "F"
+IDS_ABBR_READ, "R"
+IDS_ABBR_WRITE, "W"
+IDS_ABBR_CHANGE, "C"
+IDS_ABBR_NONE, "N"
+IDS_ALLOW, ""
+IDS_DENY, "(DENY)"
+IDS_SPECIAL_ACCESS, "(special access:)"
+IDS_GENERIC_READ, "GENERIC_READ"
+IDS_GENERIC_WRITE, "GENERIC_WRITE"
+IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
+IDS_GENERIC_ALL, "GENERIC_ALL"
+IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
+IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
+IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
+IDS_FILE_READ_DATA, "FILE_READ_DATA"
+IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
+IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
+IDS_FILE_READ_EA, "FILE_READ_EA"
+IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
+IDS_FILE_EXECUTE, "FILE_EXECUTE"
+IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
+IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
+IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
+IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
+IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
+IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
+IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
+IDS_SYNCHRONIZE, "SYNCHRONIZE"
+IDS_WRITE_OWNER, "WRITE_OWNER"
+IDS_WRITE_DAC, "WRITE_DAC"
+IDS_READ_CONTROL, "READ_CONTROL"
+IDS_DELETE, "DELETE"
+IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
+END

base/applications/cacls/resource.h

@@ -1,41 +1,44 @@
-#pragma once
+#ifndef _CACLS_RESOURCE_H
+#define _CACLS_RESOURCE_H
 
-#define IDS_HELP                        101
-#define IDS_ABBR_CI                     102
-#define IDS_ABBR_OI                     103
-#define IDS_ABBR_IO                     104
-#define IDS_ABBR_FULL                   105
-#define IDS_ABBR_READ                   106
-#define IDS_ABBR_WRITE                  107
-#define IDS_ABBR_CHANGE                 108
-#define IDS_ABBR_NONE                   109
-#define IDS_ALLOW                       110
-#define IDS_DENY                        111
-#define IDS_SPECIAL_ACCESS              112
+#define IDS_HELP    101
+#define IDS_ABBR_CI 102
+#define IDS_ABBR_OI 103
+#define IDS_ABBR_IO 104
+#define IDS_ABBR_FULL   105
+#define IDS_ABBR_READ   106
+#define IDS_ABBR_WRITE  107
+#define IDS_ABBR_CHANGE 108
+#define IDS_ABBR_NONE   109
+#define IDS_ALLOW   110
+#define IDS_DENY    111
+#define IDS_SPECIAL_ACCESS  112
 
-#define IDS_GENERIC_READ                113
-#define IDS_GENERIC_WRITE               114
-#define IDS_GENERIC_EXECUTE             115
-#define IDS_GENERIC_ALL                 116
-#define IDS_FILE_GENERIC_EXECUTE        118
-#define IDS_FILE_GENERIC_READ           119
-#define IDS_FILE_GENERIC_WRITE          120
-#define IDS_FILE_READ_DATA              121
-#define IDS_FILE_WRITE_DATA             122
-#define IDS_FILE_APPEND_DATA            123
-#define IDS_FILE_READ_EA                124
-#define IDS_FILE_WRITE_EA               125
-#define IDS_FILE_EXECUTE                126
-#define IDS_FILE_DELETE_CHILD           127
-#define IDS_FILE_READ_ATTRIBUTES        128
-#define IDS_FILE_WRITE_ATTRIBUTES       129
-#define IDS_MAXIMUM_ALLOWED             130
-#define IDS_ACCESS_SYSTEM_SECURITY      131
-#define IDS_SPECIFIC_RIGHTS_ALL         132
+#define IDS_GENERIC_READ    113
+#define IDS_GENERIC_WRITE   114
+#define IDS_GENERIC_EXECUTE 115
+#define IDS_GENERIC_ALL 116
+#define IDS_FILE_GENERIC_EXECUTE    118
+#define IDS_FILE_GENERIC_READ   119
+#define IDS_FILE_GENERIC_WRITE  120
+#define IDS_FILE_READ_DATA  121
+#define IDS_FILE_WRITE_DATA 122
+#define IDS_FILE_APPEND_DATA    123
+#define IDS_FILE_READ_EA    124
+#define IDS_FILE_WRITE_EA   125
+#define IDS_FILE_EXECUTE    126
+#define IDS_FILE_DELETE_CHILD   127
+#define IDS_FILE_READ_ATTRIBUTES    128
+#define IDS_FILE_WRITE_ATTRIBUTES   129
+#define IDS_MAXIMUM_ALLOWED 130
+#define IDS_ACCESS_SYSTEM_SECURITY  131
+#define IDS_SPECIFIC_RIGHTS_ALL 132
 #define IDS_STANDARD_RIGHTS_REQUIRED    133
-#define IDS_SYNCHRONIZE                 134
-#define IDS_WRITE_OWNER                 135
-#define IDS_WRITE_DAC                   136
-#define IDS_READ_CONTROL                137
-#define IDS_DELETE                      138
-#define IDS_STANDARD_RIGHTS_ALL         139
+#define IDS_SYNCHRONIZE 134
+#define IDS_WRITE_OWNER 135
+#define IDS_WRITE_DAC   136
+#define IDS_READ_CONTROL    137
+#define IDS_DELETE  138
+#define IDS_STANDARD_RIGHTS_ALL 139
+
+#endif /* _CACLS_RESOURCE_H */

base/applications/cacls/rsrc.rc

@@ -10,9 +10,8 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
-#include "lang/no-NO.rc"
+#include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"
 #include "lang/pt-BR.rc"

base/applications/calc/calc.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __CALC_H__
+#define __CALC_H__
 
 #include <windows.h>
 #include <tchar.h>
@@ -41,15 +42,37 @@
 #define IDC_STATIC  ((DWORD)-1)
 #endif
 
-#define CALC_VERSION        TEXT("1.11")
-
-#define MAX_CALC_SIZE       256
+#define CALC_VERSION        TEXT("1.09")
 
 /*#define USE_KEYBOARD_HOOK*/
 
 #define SIZEOF(_ar)     (sizeof(_ar)/sizeof(_ar[1]))
 
 // RPN.C
+/*
+typedef struct _postfix_item_t {
+    unsigned int type;
+    union {
+#ifdef ENABLE_MULTI_PRECISION
+        mpfr_t       mf;
+#else
+        double       f;
+        INT64        i;
+#endif
+        struct {
+            unsigned short int code;
+            unsigned short int elem;
+        } action;
+    } number;
+    struct _postfix_item_t *next;
+} postfix_item_t;
+
+void flush_postfix(void);
+void infix2postfix(char *in_str);
+postfix_item_t *exec_postfix(void);
+*/
+
+//
 
 enum {
     RPN_OPERATOR_PARENT,
@@ -68,8 +91,6 @@ enum {
     RPN_OPERATOR_MOD,
     RPN_OPERATOR_POW,
     RPN_OPERATOR_SQR,
-
-    RPN_OPERATOR_NONE
 };
 
 typedef union {
@@ -101,7 +122,7 @@ void stop_rpn_engine(void);
 typedef struct {
     char *data;
     char *ptr;
-    UINT  wm_msg;
+    int   wm_msg;
 } sequence_t;
 
 typedef struct {
@@ -123,8 +144,7 @@ typedef struct {
 #endif
     HWND          hWnd;
     DWORD         layout;
-    TCHAR         buffer[MAX_CALC_SIZE];
-    TCHAR         source[MAX_CALC_SIZE];
+    TCHAR         buffer[256];
     TCHAR        *ptr;
     calc_number_t code;
     calc_number_t prev;
@@ -167,7 +187,6 @@ extern calc_t calc;
 
 #define MODIFIER_INV    0x01
 #define MODIFIER_HYP    0x02
-#define NO_CHAIN        0x04
 
 void apply_int_mask(calc_number_t *a);
 #ifdef ENABLE_MULTI_PRECISION
@@ -235,3 +254,5 @@ INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
 void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);
 void ConvInit(HWND hWnd);
+
+#endif

base/applications/calc/calc.rbuild

@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" unicode="yes">
+<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="true" unicode="yes">
 	<include base="calc">.</include>
-	<define name="DISABLE_HTMLHELP_SUPPORT">1</define>
-	<library>advapi32</library>
-	<library>gdi32</library>
+    <define name="DISABLE_HTMLHELP_SUPPORT">1</define>
+	<define name="_WIN32_WINNT">0x0501</define>
 	<library>user32</library>
+	<library>gdi32</library>
+	<library>kernel32</library>
 	<file>about.c</file>
-	<file>convert.c</file>
+    <file>convert.c</file>
 	<file>function.c</file>
 	<file>rpn.c</file>
 	<file>utl.c</file>

base/applications/calc/convert.c

@@ -7,7 +7,6 @@
 
     The base units for all categories are:
 
-    ANGLE..........degrees
     AREA...........square meters
     CONSUMPTION....kilometers per liter
     CURRENCY.......Euro
@@ -16,10 +15,9 @@
     POWER..........Watt
     PRESSURE.......Pascal
     TEMPERATURE....kelvin
-    TIME...........seconds
     VELOCITY.......meters per second
     VOLUME.........liter
-    WEIGHT.........gram
+    WEIGHT.........kilogram
 
     The '$' character is used as "what you read into the display".
 */
@@ -43,48 +41,37 @@ typedef struct {
 #define DECLARE_CONV_END \
     { 0, NULL, NULL },
 
-/*
-    1 gradian = 0.9 deg
-    1 radian = 57.29577951308233 deg
-*/
-static const conv_t conv_ANGLE[] = {
-    DECLARE_CONV_UNIT(ANGLE, DEGREES,  "$", "$")
-    DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9")
-    DECLARE_CONV_UNIT(ANGLE, RADIANS,  "$*180/P", "$*P/180")
-    DECLARE_CONV_END
-};
-
 /*
     1 acre ................ = 4840 square yd = 4046,8564224 mq
-    1 acre brazil ......... =
-    1 acre france ......... =
+    1 acre brazil ......... = 
+    1 acre france ......... = 
     1 acre scots .......... = 5000 mq
     1 acre us ............. = 4840*(36/39.37)^2 m = 6272640/1549.9969 m
     1 are ................. = 100 mq
     1 chou ................ = 108000*(10/33)^2 mq
-    1 danbo ............... =
+    1 danbo ............... = 
     1 ha .................. = 10000 mq
-    1 jeongbo ............. =
-    1 morgen hungary ...... =
-    1 mu .................. = 2000/3 mq
-    1 ping ................ =
-    1 pyeong .............. =
-    1 pyeongbangja ........ =
-    1 rai ................. = 1600 mq
+    1 jeongbo ............. = 
+    1 morgen hungary ...... = 
+    1 mu .................. = 
+    1 ping ................ = 
+    1 pyeong .............. = 
+    1 pyeongbangja ........ = 
+    1 rai ................. = 
     1 se .................. = 1080*(10/33)^2 mq
     1 square cm ........... = 0.0001 mq
-    1 square chr .......... =
+    1 square chr .......... = 
     1 square fathom ....... = 1.8288^2 = 3.34450944 mq
     1 square fathom hungary = 1.8964838^2 = 3.59665080366244 mq
     1 square ft ........... = 0,09290304 mq
     1 square in ........... = 0,00064516 mq
     1 square km ........... = 1000000 mq
-    1 square lar .......... =
+    1 square lar .......... = 
     1 square mile ......... = 1609.344^2 = 2589988.110336 mq
     1 square mm ........... = 0,000001 mq
     1 square shaku ........ = (10/33)^2 mq
-    1 square tsuen ........ =
-    1 square va ........... =
+    1 square tsuen ........ = 
+    1 square va ........... = 
     1 square yard ......... = 0,83612736 mq
     1 tan ................. = 10800*(10/33)^2 mq
     1 tsubo ............... = 36*(10/33)^2 mq
@@ -101,11 +88,11 @@ static const conv_t conv_AREA[] = {
     DECLARE_CONV_UNIT(AREA, HECTARES,               "$*10000",           "$/10000")
 //    DECLARE_CONV_UNIT(AREA, JEONGBO,                "$", "$")
 //    DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY,         "$", "$")
-    DECLARE_CONV_UNIT(AREA, MU,                     "$*(2000/3)", "$/(2000/3)")
+//    DECLARE_CONV_UNIT(AREA, MU,                     "$", "$")
 //    DECLARE_CONV_UNIT(AREA, PING,                   "$", "$")
 //    DECLARE_CONV_UNIT(AREA, PYEONG,                 "$", "$")
 //    DECLARE_CONV_UNIT(AREA, PYEONGBANGJA,           "$", "$")
-    DECLARE_CONV_UNIT(AREA, RAI,                    "$*1600", "$/1600")
+//    DECLARE_CONV_UNIT(AREA, RAI,                    "$", "$")
     DECLARE_CONV_UNIT(AREA, SE,                     "$*108000/1089",     "$*1089/108000")
     DECLARE_CONV_UNIT(AREA, SQUARE_CENTIMETERS,     "$*0,0001",          "$/0,0001")
 //    DECLARE_CONV_UNIT(AREA, SQUARE_CHR,             "$", "$")
@@ -144,7 +131,6 @@ 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, 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, EURO,               "$",         "$")
@@ -156,20 +142,15 @@ static const conv_t conv_CURRENCY[] = {
     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")
-    DECLARE_CONV_UNIT(CURRENCY, SLOVAK_KORUNA,      "$/30,126",  "$*30,126")
     DECLARE_CONV_UNIT(CURRENCY, SLOVENIAN_TOLAR,    "$/239,640", "$*239,640")
     DECLARE_CONV_UNIT(CURRENCY, SPANISH_PESETA,     "$/166,386", "$*166,386")
     DECLARE_CONV_END
 };
 
 /*
-    1 cal15 .... = 4.1855 J
-    1 BTU ...... = 1055.056 J
+    1 15^C ..... = 4.1855 J
     1 ERG ...... = 0.0000001 J
-    1 EV ....... = 0.000000000000000000160217653 J
-    1 Foot-Pound = 1.3558179483314004 J
     1 IT calorie = 4.1868 J
-    1 KCa ...... = 4186.8 J
     1 KJ ....... = 1000 J
     1 KWh ...... = 3600 J
     1 IUNS ..... = 4.182 J
@@ -177,12 +158,8 @@ static const conv_t conv_CURRENCY[] = {
 */
 static const conv_t conv_ENERGY[] = {
     DECLARE_CONV_UNIT(ENERGY, 15_C_CALORIES,        "$*4.1855",   "$/4.1855")
-    DECLARE_CONV_UNIT(ENERGY, BTUS,                 "$*1055.056", "$/1055.056")
     DECLARE_CONV_UNIT(ENERGY, ERGS,                 "$*.0000001", "$/.0000001")
-    DECLARE_CONV_UNIT(ENERGY, EVS,                  "$*.000000000000000000160217653", "$/.000000000000000000160217653")
-    DECLARE_CONV_UNIT(ENERGY, FOOT_POUNDS,          "$*1.3558179483314004",   "$/1.3558179483314004")
     DECLARE_CONV_UNIT(ENERGY, IT_CALORIES,          "$*4.1868",   "$/4.1868")
-    DECLARE_CONV_UNIT(ENERGY, IT_KILOCALORIES,      "$*4186.8",   "$/4186.8")
     DECLARE_CONV_UNIT(ENERGY, JOULES,               "$",          "$")
     DECLARE_CONV_UNIT(ENERGY, KILOJOULES,           "$*1000",     "$/1000")
     DECLARE_CONV_UNIT(ENERGY, KILOWATT_HOURS,       "$*3600",     "$/3600")
@@ -193,62 +170,59 @@ static const conv_t conv_ENERGY[] = {
 
 /*
     1 angstrom ....... = 0.0000000001 m
-    1 astronomical unit= 149598000000 m
+    1 astronomila unit = 149598000000 m
     1 barleycorn ..... = 1/3 inch = 0.9144/108 m
     1 cm ............. = 1/100 m
     1 chain uk ....... = 22 yards = 22*0.9144 m
-    1 chi ............ = 1/3 m
+    1 chi ............ = 
     1 chou ........... = 3600/33 m
-    1 chr ............ =
-    1 cun ............ = 1/10 chi = 1/30 m
+    1 chr ............ = 
     1 fathom ......... = 2 yard = 2*0.9144 m
     1 fathom ungary .. = 1.8964838 m (fixed)
     1 feet ........... = 12 inch = 0.9144/3 m
     1 furlong ........ = 10 chains = 220*0.9144 m
-    1 gan ............ =
+    1 gan ............ = 
     1 hand ........... = 4 inches = 0.9144/9 m
-    1 hunh ........... =
+    1 hunh ........... = 
     1 inch ........... = yard/36 = 0.9144/36 m
-    1 ja ............. =
-    1 jeong .......... =
-    1 kabiet ......... =
+    1 ja ............. = 
+    1 jeong .......... = 
+    1 kabiet ......... = 
     1 ken ............ = 60/33 m
-    1 keub ........... =
+    1 keub ........... = 
     1 km ............. = 1000 m
-    1 lar ............ =
+    1 lar ............ = 
     1 light year ..... = 9460730472580800 m
     1 link uk ........ = 0.01 chains = 0.22*0.9144 m
-    1 micron ......... = 0.000001 m
     1 mile ........... = 1760 yards = 1609.344 m
     1 millimeter ..... = 1/1000 m
     1 nautical mile .. = 1852 m
-    1 nieu ........... =
+    1 nieu ........... = 
     1 parsec ......... = 30856800000000000 m
     1 pica ........... = yard/216 = 0.9144/216 m
-    1 ri japan ....... =
-    1 ri korea ....... =
-    1 rod ............ = 5.0292 m
-    1 sawk ........... =
-    1 sen ............ =
+    1 ri japan ....... = 
+    1 ri korea ....... = 
+    1 sawk ........... = 
+    1 sen ............ = 
     1 shaku .......... = 10/33 m
     1 span ........... = 9 inches = 0.9144/4 m
-    1 sun ............ = 1/33 m
-    1 tsuen .......... =
-    1 va ............. =
+    1 sun ............ = 10/330 m
+    1 tsuen .......... = 
+    1 va ............. = 
     1 yard ........... = 0.9144 m
-    1 yote ........... =
-    1 zhang .......... =
+    1 yote ........... = 
+    1 zhang .......... = 
 */
 static const conv_t conv_LENGTH[] = {
     DECLARE_CONV_UNIT(LENGTH, ANGSTROMS,            "$*0.0000000001",   "$/0.0000000001")
-    DECLARE_CONV_UNIT(LENGTH, ASTRONOMICAL_UNITS,   "$*149598000000",   "$/149598000000")
+    DECLARE_CONV_UNIT(LENGTH, ASTRONOMILA_UNITS,    "$*149598000000",   "$/149598000000")
     DECLARE_CONV_UNIT(LENGTH, BARLEYCORNS,          "$*0.9144/108",     "$/0.9144*108")
     DECLARE_CONV_UNIT(LENGTH, CENTIMETERS,          "$/100",            "$*100")
     DECLARE_CONV_UNIT(LENGTH, CHAINS_UK,            "$*20.1168",        "$/20.1168")
-    DECLARE_CONV_UNIT(LENGTH, CHI,                  "$/3",              "$*3")
+//    DECLARE_CONV_UNIT(LENGTH, CHI,                  "$", "$")
     DECLARE_CONV_UNIT(LENGTH, CHOU,                 "$*3600/33",        "$*33/3600")
 //    DECLARE_CONV_UNIT(LENGTH, CHR,                  "$", "$")
-    DECLARE_CONV_UNIT(LENGTH, CUN,                  "$/30",             "$*30")
+//    DECLARE_CONV_UNIT(LENGTH, CUN,                  "$", "$")
     DECLARE_CONV_UNIT(LENGTH, FATHOMS,              "$*1.8288",         "$/1.8288")
     DECLARE_CONV_UNIT(LENGTH, FATHOMS_HUNGARY,      "$*1.8964838",      "$/1.8964838")
     DECLARE_CONV_UNIT(LENGTH, FEET,                 "$*0.3048",         "$/0.3048")
@@ -267,21 +241,19 @@ static const conv_t conv_LENGTH[] = {
     DECLARE_CONV_UNIT(LENGTH, LIGHT_YEARS,          "$*9460730472580800", "$/9460730472580800")
     DECLARE_CONV_UNIT(LENGTH, LINKS_UK,             "$*0.201168",       "$/0.201168")
     DECLARE_CONV_UNIT(LENGTH, METERS,               "$",                "$")
-    DECLARE_CONV_UNIT(LENGTH, MICRONS,              "$*0.000001",       "$/0.000001")
     DECLARE_CONV_UNIT(LENGTH, MILES,                "$*1609.344",       "$/1609.344")
     DECLARE_CONV_UNIT(LENGTH, MILLIMETERS,          "$/1000",           "$*1000")
     DECLARE_CONV_UNIT(LENGTH, NAUTICAL_MILES,       "$*1852",           "$/1852")
 //    DECLARE_CONV_UNIT(LENGTH, NIEU,                 "$", "$")
     DECLARE_CONV_UNIT(LENGTH, PARSECS,              "$*30856800000000000", "$/30856800000000000")
     DECLARE_CONV_UNIT(LENGTH, PICAS,                "$*0.9144/216",     "$/0.9144*216")
-    DECLARE_CONV_UNIT(LENGTH, RODS,                 "$*5.0292",         "$/5.0292")
 //    DECLARE_CONV_UNIT(LENGTH, RI_JAPAN,             "$", "$")
 //    DECLARE_CONV_UNIT(LENGTH, RI_KOREA,             "$", "$")
 //    DECLARE_CONV_UNIT(LENGTH, SAWK,                 "$", "$")
 //    DECLARE_CONV_UNIT(LENGTH, SEN,                  "$", "$")
     DECLARE_CONV_UNIT(LENGTH, SHAKU,                "$*10/33",          "$*33/10")
     DECLARE_CONV_UNIT(LENGTH, SPAN,                 "$*0.9144/4",       "$*4/0.9144")
-    DECLARE_CONV_UNIT(LENGTH, SUN,                  "$*1/33",            "$*33")
+    DECLARE_CONV_UNIT(LENGTH, SUN,                  "$*10/330",         "$*330/10")
 //    DECLARE_CONV_UNIT(LENGTH, TSUEN,                "$", "$")
 //    DECLARE_CONV_UNIT(LENGTH, VA,                   "$", "$")
     DECLARE_CONV_UNIT(LENGTH, YARDS,                "$*0.9144",         "$/0.9144")
@@ -291,63 +263,33 @@ static const conv_t conv_LENGTH[] = {
 };
 
 /*
-    1 BTU/min = 17.5842642 W
-    1 Foot-pound/minute = 0.02259696580552333 W
     1 hp = 745.69987158227022 W
     1 KW = 1000 W
     1 MW = 1000000 W
 */
 static const conv_t conv_POWER[] = {
-    DECLARE_CONV_UNIT(POWER, BTUS_PER_MINUTE, "$*17.5842642", "$/17.5842642")
-    DECLARE_CONV_UNIT(POWER, FPS_PER_MINUTE,  "$*0.02259696580552333", "$/0.02259696580552333")
-    DECLARE_CONV_UNIT(POWER, HORSEPOWER,      "$*745.69987158227022", "$/745.69987158227022")
-    DECLARE_CONV_UNIT(POWER, KILOWATTS,       "$*1000", "$/1000")
-    DECLARE_CONV_UNIT(POWER, MEGAWATTS,       "$*1000000", "$/1000000")
-    DECLARE_CONV_UNIT(POWER, WATTS,           "$", "$")
+    DECLARE_CONV_UNIT(POWER, HORSEPOWER,    "$*745.69987158227022", "$/745.69987158227022")
+    DECLARE_CONV_UNIT(POWER, KILOWATTS,     "$*1000", "$/1000")
+    DECLARE_CONV_UNIT(POWER, MEGAWATTS,     "$*1000000", "$/1000000")
+    DECLARE_CONV_UNIT(POWER, WATTS,         "$", "$")
     DECLARE_CONV_END
 };
 
 /*
     1 ATM   = 101325 Pa
     1 BAR   = 100000 Pa
-    1 hPa   = 100 Pa
-    1 kPa   = 1000 Pa
     1 mm HG = 133.322 Pa
-    1 psi   = 6894.757 Pa
+    1 psi   = 6894.757 Pa 
 */
 static const conv_t conv_PRESSURE[] = {
     DECLARE_CONV_UNIT(PRESSURE, ATMOSPHERES,   "$*101325",   "$/101325")
     DECLARE_CONV_UNIT(PRESSURE, BARS,          "$*100000",   "$/100000")
-    DECLARE_CONV_UNIT(PRESSURE, HECTOPASCALS,  "$*100",      "$/100")
-    DECLARE_CONV_UNIT(PRESSURE, KILOPASCALS,   "$*1000",     "$/1000")
     DECLARE_CONV_UNIT(PRESSURE, MM_OF_MERCURY, "$*133.322",  "$/133.322")
     DECLARE_CONV_UNIT(PRESSURE, PASCALS,       "$",          "$")
     DECLARE_CONV_UNIT(PRESSURE, PSI,           "$*6894.757", "$/6894.757")
     DECLARE_CONV_END
 };
 
-/*
-    1 day ....... = 86400 s
-    1 hour ...... = 3600 s
-    1 microsecond = 0.000001 s
-    1 millisecond = 0.001 s
-    1 nanosecond. = 0.000000001 s
-    1 minute .... = 60 s
-    1 week ...... = 669600 s
-*/
-static const conv_t conv_TIME[] = {
-    DECLARE_CONV_UNIT(TIME, MINUTES,      "$*60",          "$/60")
-    DECLARE_CONV_UNIT(TIME, DAYS,         "$*86400",       "$/86400")
-    DECLARE_CONV_UNIT(TIME, HOURS,        "$*3600",        "$/3600")
-    DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001",       "$/0.001")
-    DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001",    "$/0.000001")
-    DECLARE_CONV_UNIT(TIME, NANOSECONDS,  "$*0.000000001", "$/0.000000001")
-    DECLARE_CONV_UNIT(TIME, SECONDS,      "$",             "$")
-    DECLARE_CONV_UNIT(TIME, WEEKS,        "$*604800",      "$/604800")
-    DECLARE_CONV_UNIT(TIME, YEARS,        "$*31556952",    "$/31556952")
-    DECLARE_CONV_END
-};
-
 /*
     C = K - 273.15
     F = K * 9/5 - 459.67
@@ -362,18 +304,14 @@ static const conv_t conv_TEMPERATURE[] = {
 };
 
 /*
-    1 cm/s = 0.01 m/s
-    1 f/h  = 0.0000846666667 m/s
-    1 f/s  = 0.3048 m/s
+    1 f/h  = 0.3048 m/s
     1 Km/h = 10/36 m/s -> 0.27778 m/s
     1 knot = 18.52/36 m/s -> 0.51444444 m/s
     1 mach = 340.3 m/s
     1 mph  = 0.44704 m/s
 */
 static const conv_t conv_VELOCITY[] = {
-    DECLARE_CONV_UNIT(VELOCITY, CMS_SECOND,         "$*.01",      "$/.01")
-    DECLARE_CONV_UNIT(VELOCITY, FEET_SECOND,        "$*.3048",    "$/.3048")
-    DECLARE_CONV_UNIT(VELOCITY, FEET_HOUR,          "$*.0000846666667", "$/.0000846666667")
+    DECLARE_CONV_UNIT(VELOCITY, FEET_HOUR,          "$*.3048",    "$/.3048")
     DECLARE_CONV_UNIT(VELOCITY, KILOMETERS_HOUR,    "$*10/36",    "$*36/10")
     DECLARE_CONV_UNIT(VELOCITY, KNOTS,              "$*18.52/36", "$*36/18.52")
     DECLARE_CONV_UNIT(VELOCITY, MACH,               "$*340.3",    "$/340.3")
@@ -385,7 +323,7 @@ static const conv_t conv_VELOCITY[] = {
 /*
     1 barrel uk ...... = 163.65924 l
     1 barrel oil ..... = 158.987295 l
-    1 bun ............ =
+    1 bun ............ = 
     1 bushel uk ...... = 36.36872 l
     1 bushel us ...... = 35.23907017 l
     1 cubic cm  ...... = 0.001 l
@@ -393,17 +331,17 @@ static const conv_t conv_VELOCITY[] = {
     1 cubic inch ..... = 0.016387064 l
     1 cubic meter .... = 1000 l
     1 cubic yard ..... = 764.554857 l
-    1 doe ............ =
+    1 doe ............ = 
     1 fluid ounce uk   = 0.0284130625 l
     1 fluid ounce us   = 0.0295735295625 l
     1 gallon uk ...... = 4.54609 l
     1 gallon dry us .. = 4.40488377086 l
     1 gallon liquid us = 3.785411784 l
     1 gou ............ = 0.1809 l
-    1 hop ............ =
-    1 icce ........... =
-    1 kwian .......... =
-    1 mal ............ =
+    1 hop ............ = 
+    1 icce ........... = 
+    1 kwian .......... = 
+    1 mal ............ = 
     1 milliliter ..... = 0.001 l
     1 pint uk ........ = 0.56826125 l
     1 pint dry us .... = 0.5506104713575 l
@@ -411,10 +349,10 @@ static const conv_t conv_VELOCITY[] = {
     1 quart uk ....... = 1.1365225 l
     1 quart dry us ... = 1.101220942715 l
     1 quart liquid us  = 0.946352946 l
-    1 seki ........... =
-    1 syou ........... =
-    1 tananloung ..... =
-    1 tang ........... =
+    1 seki ........... = 
+    1 syou ........... = 
+    1 tananloung ..... = 
+    1 tang ........... = 
     1 to ............. = 18040 l
 */
 static const conv_t conv_VOLUME[] = {
@@ -458,16 +396,16 @@ static const conv_t conv_VOLUME[] = {
 /*
     1 baht ............ = 12.244 g
     1 carat ........... = 0.2 g
-    1 chung ........... =
-    1 don ............. =
-    1 geun ............ =
-    1 gwan ............ =
-    1 harb ............ =
-    1 jin china ....... =
-    1 jin taiwan ...... =
-    1 Kan ............. = 3750 g
+    1 chung ........... = 
+    1 don ............. = 
+    1 geun ............ = 
+    1 gwan ............ = 
+    1 harb ............ = 
+    1 jin china ....... = 
+    1 jin taiwan ...... = 
+    1 Kan ............. =
     1 Kilograms ....... = 1000 g
-    1 Kin ............. = 600 g
+    1 Kin ............. =
     1 Liang China ..... =
     1 Liang Taiwan .... =
     1 monme ........... = 3.75 g
@@ -475,12 +413,12 @@ static const conv_t conv_VOLUME[] = {
     1 ounce troy ...... = 31.1034768 g
     1 pound ........... = 453.59237 g
     1 quintal metric .. = 100000 g
-    1 saloung ......... =
+    1 saloung ......... = 
     1 stone ........... = 6350.29318 g
-    1 tamlung ......... =
+    1 tamlung ......... = 
     1 ton ............. = 1000000 g
-    1 ton uk .......... = 1016046.9088 g  // long ton
-    1 ton us .......... = 907184.74 g     // short ton
+    1 ton uk .......... = 1016046.9088 g
+    1 ton us .......... = 907184.74 g
 */
 static const conv_t conv_WEIGHT[] = {
     DECLARE_CONV_UNIT(WEIGHT, BAHT,                 "$*12.244",       "$/12.244")
@@ -493,9 +431,9 @@ static const conv_t conv_WEIGHT[] = {
 //    DECLARE_CONV_UNIT(WEIGHT, HARB,                 "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, JIN_CHINA,            "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, JIN_TAIWAN,           "$", "$")
-    DECLARE_CONV_UNIT(WEIGHT, KAN,                  "$*3750",         "$/3750")
+//    DECLARE_CONV_UNIT(WEIGHT, KAN,                  "$", "$")
     DECLARE_CONV_UNIT(WEIGHT, KILOGRAMS,            "$*1000",         "$/1000")
-    DECLARE_CONV_UNIT(WEIGHT, KIN,                  "$*600",          "$/600")
+//    DECLARE_CONV_UNIT(WEIGHT, KIN,                  "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, LIANG_CHINA,          "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, LIANG_TAIWAN,         "$", "$")
     DECLARE_CONV_UNIT(WEIGHT, MONME,                "$*3.75",         "$/3.75")
@@ -513,7 +451,6 @@ static const conv_t conv_WEIGHT[] = {
 };
 
 static const conv_category_t conv_table[] = {
-    DECLARE_CONV_CAT(ANGLE)
     DECLARE_CONV_CAT(AREA)
     DECLARE_CONV_CAT(CONSUMPTION)
     DECLARE_CONV_CAT(CURRENCY)
@@ -521,7 +458,6 @@ static const conv_category_t conv_table[] = {
     DECLARE_CONV_CAT(LENGTH)
     DECLARE_CONV_CAT(POWER)
     DECLARE_CONV_CAT(PRESSURE)
-    DECLARE_CONV_CAT(TIME)
     DECLARE_CONV_CAT(TEMPERATURE)
     DECLARE_CONV_CAT(VELOCITY)
     DECLARE_CONV_CAT(VOLUME)
@@ -551,7 +487,7 @@ void ConvExecute(HWND hWnd)
             break;
         }
     }
-
+    
     /* The units can be sorted, so I must search the exact match */
     item = items;
     SendDlgItemMessage(hWnd, IDC_COMBO_FROM, CB_GETLBTEXT, from, (LPARAM)txt_cb);
@@ -625,3 +561,4 @@ void ConvInit(HWND hWnd)
     ConvAdjust(hWnd, 0);
 }
 
+

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

@@ -4,15 +4,19 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "<22><><EFBFBD><EFBFBD>",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "<22><><EFBFBD><EFBFBD>",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "<22><><EFBFBD>",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD>",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "<22><><EFBFBD><EFBFBD>",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "<22><><EFBFBD><EFBFBD>",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "<22><><EFBFBD>",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD>",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "<22><><EFBFBD>",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -226,8 +230,8 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -337,37 +341,38 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
 BEGIN
     POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",           IDM_EDIT_COPY
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",           IDM_EDIT_PASTE
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                   IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                      IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",               IDM_VIEW_CONVERSION
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>a<EFBFBD><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF5",         IDM_VIEW_HEX, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF6",               IDM_VIEW_DEC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF7",                 IDM_VIEW_OCT, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF8",                 IDM_VIEW_BIN, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>a<EFBFBD><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF5",                     IDM_VIEW_HEX, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF6",                 IDM_VIEW_DEC, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF7",                   IDM_VIEW_OCT, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF8",                  IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF2",                 IDM_VIEW_DEG, CHECKED
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF3",                 IDM_VIEW_RAD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF4",                 IDM_VIEW_GRAD, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF4",                   IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       IDM_VIEW_GROUP, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                       IDM_HELP_HELP
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "<22><> ReactOS Calc",             IDM_HELP_ABOUT
+        MENUITEM "<22><> ReactOS Calc",          IDM_HELP_ABOUT
     END
 END
 
@@ -375,32 +380,32 @@ IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE
 BEGIN
     POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",           IDM_EDIT_COPY
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",           IDM_EDIT_PASTE
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                      IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",               IDM_VIEW_CONVERSION
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>a<EFBFBD><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF5",         IDM_VIEW_HEX, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF6",               IDM_VIEW_DEC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF7",                 IDM_VIEW_OCT, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF8",                 IDM_VIEW_BIN, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>a<EFBFBD><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF5",                     IDM_VIEW_HEX, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF6",                 IDM_VIEW_DEC, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF7",                   IDM_VIEW_OCT, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF8",                  IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>\tF12",                  IDM_VIEW_QWORD, CHECKED
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>\tF2",                   IDM_VIEW_DWORD, CHECKED
         MENUITEM "<22><><EFBFBD><EFBFBD>\tF3",                    IDM_VIEW_WORD, CHECKED
         MENUITEM "<22><><EFBFBD><EFBFBD>\tF4",                    IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       IDM_VIEW_GROUP, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                       IDM_HELP_HELP
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "<22><> ReactOS Calc",             IDM_HELP_ABOUT
+        MENUITEM "<22><> ReactOS Calc",          IDM_HELP_ABOUT
     END
 END
 
@@ -408,22 +413,22 @@ IDR_MENU_STANDARD MENU DISCARDABLE
 BEGIN
     POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",           IDM_EDIT_COPY
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",           IDM_EDIT_PASTE
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                      IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",               IDM_VIEW_CONVERSION
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       IDM_VIEW_GROUP, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                       IDM_HELP_HELP
+        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "<22><> ReactOS Calc",             IDM_HELP_ABOUT
+        MENUITEM "<22><> ReactOS Calc",          IDM_HELP_ABOUT
     END
 END
 
@@ -439,41 +444,31 @@ END
 // types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_AREA           "<22><><EFBFBD><EFBFBD>"
-    IDS_CONV_CONSUMPTION    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_CONV_CURRENCY       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_ENERGY         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_LENGTH         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_POWER          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_PRESSURE       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_TEMPERATURE    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_TIME           "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_VELOCITY       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_VOLUME         "<22><><EFBFBD><EFBFBD>"
-    IDS_CONV_WEIGHT         "<22><><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ANGLE_GRADIANS      "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ANGLE_RADIANS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_CONV_AREA           "Area"
+    IDS_CONV_CONSUMPTION    "Consumption (engines)"
+    IDS_CONV_CURRENCY       "Currencies"
+    IDS_CONV_ENERGY         "Energy"
+    IDS_CONV_LENGTH         "Lenghts"
+    IDS_CONV_POWER          "Power"
+    IDS_CONV_PRESSURE       "Pressure"
+    IDS_CONV_TEMPERATURE    "Temperature"
+    IDS_CONV_VELOCITY       "Velocity"
+    IDS_CONV_VOLUME         "Volume"
+    IDS_CONV_WEIGHT         "Weights"
 END
 
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_AREA_ACRES                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_ACRES_BRAZIL           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_FRANCE           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_SCOTS            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_US               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_AREA_ARES                   "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_AREA_ACRES                  "Acres"
+    IDS_AREA_ACRES_BRAZIL           "Acres (Brazil)"
+    IDS_AREA_ACRES_FRANCE           "Acres (France)"
+    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
+    IDS_AREA_ACRES_US               "Acres (US)"
+    IDS_AREA_ARES                   "Ares"
     IDS_AREA_CHOU                   "Chou"
     IDS_AREA_DANBO                  "Danbo"
-    IDS_AREA_HECTARES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_AREA_HECTARES               "Hectares"
     IDS_AREA_JEONGBO                "Jeongbo"
     IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungary)"
     IDS_AREA_MU                     "Mu"
@@ -482,21 +477,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_CHR             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> chr"
-    IDS_AREA_SQUARE_FATHOMS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_SQUARE_FEET            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_INCHES          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_KILOMETERS      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_LAR             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> lar"
-    IDS_AREA_SQUARE_METER           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_MILES           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_MILLIMETERS     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_SHAKU           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> shaku"
-    IDS_AREA_SQUARE_TSUEN           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> tsuen"
-    IDS_AREA_SQUARE_VA              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> va"
-    IDS_AREA_SQUARE_YARD            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_AREA_SQUARE_CENTIMETERS     "Square centimeters"
+    IDS_AREA_SQUARE_CHR             "Square chr"
+    IDS_AREA_SQUARE_FATHOMS         "Square fathoms"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
+    IDS_AREA_SQUARE_FEET            "Square feet"
+    IDS_AREA_SQUARE_INCHES          "Square inches"
+    IDS_AREA_SQUARE_KILOMETERS      "Square kilometers"
+    IDS_AREA_SQUARE_LAR             "Square lar"
+    IDS_AREA_SQUARE_METER           "Square meter"
+    IDS_AREA_SQUARE_MILES           "Square miles"
+    IDS_AREA_SQUARE_MILLIMETERS     "Square millimeters"
+    IDS_AREA_SQUARE_SHAKU           "Square shaku"
+    IDS_AREA_SQUARE_TSUEN           "Square tsuen"
+    IDS_AREA_SQUARE_VA              "Square va"
+    IDS_AREA_SQUARE_YARD            "Square yard"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -504,10 +499,10 @@ END
 // TYPES OF COMSUMPTIONS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONSUMPTION_L_PER_100_KM    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/100 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONSUMPTION_MILES_GALLON_UK "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD> (<28><>)"
-    IDS_CONSUMPTION_MILES_GALLON_US "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
+    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
+    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometers"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
+    IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
 END
 
 // TYPES OF CURRENCIES
@@ -516,10 +511,9 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
     IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
-    IDS_CURRENCY_CZECH_KORUNA       "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
-    IDS_CURRENCY_EURO               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_CURRENCY_EURO               "Euro"
     IDS_CURRENCY_FINNISH_MARKKA     "Finnish markka"
     IDS_CURRENCY_FRENCH_FRANC       "French franc"
     IDS_CURRENCY_GREEK_DRACHMA      "Greek Drachma"
@@ -528,7 +522,6 @@ BEGIN
     IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
     IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slovak koruna"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
     IDS_CURRENCY_SPANISH_PESETA     "Spanish peseta"
 END
@@ -536,60 +529,54 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_BTUS                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_ERGS                 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_EVS                  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
-    IDS_ENERGY_IT_CALORIES          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_IT_KILOCALORIES      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_JOULES               "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_KILOJOULES           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_KILOWATT_HOURS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_NUTRITION_CALORIES   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_TH_CALORIES          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
+    IDS_ENERGY_ERGS                 "Ergs"
+    IDS_ENERGY_IT_CALORIES          "International Table calories"
+    IDS_ENERGY_JOULES               "Joules"
+    IDS_ENERGY_KILOJOULES           "Kilojoules"
+    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
+    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calories"
+    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie"
 END
 
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_BARLEYCORNS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CENTIMETERS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CHAINS_UK            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>)"
+    IDS_LENGTH_ANGSTROMS            "Angstroms"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomila units"
+    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
+    IDS_LENGTH_CENTIMETERS          "Centimeters"
+    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
     IDS_LENGTH_CHI                  "Chi"
     IDS_LENGTH_CHOU                 "Chou"
     IDS_LENGTH_CHR                  "Chr"
     IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FATHOMS_HUNGARY      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_FEET                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FURLONGS             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_LENGTH_FATHOMS              "Fathoms"
+    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Hungary)"
+    IDS_LENGTH_FEET                 "Feet"
+    IDS_LENGTH_FURLONGS             "Furlongs"
     IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_LENGTH_HANDS                "Hands"
     IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_LENGTH_INCHES               "Inches"
     IDS_LENGTH_JA                   "Ja"
     IDS_LENGTH_JEONG                "Jeong"
     IDS_LENGTH_KABIET               "Kabiet"
     IDS_LENGTH_KEN                  "Ken"
     IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_LENGTH_KILOMETERS           "Kilometers"
     IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_LENGTH_LIGHT_YEARS          "Light years"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
-    IDS_LENGTH_METERS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MICRONS              "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MILES                "<22><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MILLIMETERS          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_NAUTICAL_MILES       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
+    IDS_LENGTH_METERS               "Meters"
+    IDS_LENGTH_MILES                "Miles"
+    IDS_LENGTH_MILLIMETERS          "Millimeters"
+    IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
     IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_PICAS                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_RI_JAPAN             "Ri (<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_RI_KOREA             "Ri (<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_RODS                 "Rods"
+    IDS_LENGTH_PARSECS              "Parsecs"
+    IDS_LENGTH_PICAS                "Picas"
+    IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
+    IDS_LENGTH_RI_KOREA             "Ri (Korea)"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -597,7 +584,7 @@ BEGIN
     IDS_LENGTH_SUN                  "Sun"
     IDS_LENGTH_TSUEN                "Tsuen"
     IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_LENGTH_YARDS                "Yards"
     IDS_LENGTH_YOTE                 "Yote"
     IDS_LENGTH_ZHANG                "Zhang"
 END
@@ -605,94 +592,74 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
-    IDS_POWER_HORSEPOWER            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_POWER_KILOWATTS             "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_MEGAWATTS             "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_WATTS                 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_POWER_HORSEPOWER            "Horsepower"
+    IDS_POWER_KILOWATTS             "Kilowatts"
+    IDS_POWER_MEGAWATTS             "Megawatts"
+    IDS_POWER_WATTS                 "Watts"
 END
 
 // TYPE OF PRESSURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_BARS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_HECTOPASCALS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_KILOPASCALS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_MM_OF_MERCURY      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_PASCALS            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_PSI                "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
+    IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
+    IDS_PRESSURE_BARS               "Bars"
+    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
+    IDS_PRESSURE_PASCALS            "Pascals"
+    IDS_PRESSURE_PSI                "Pounds-force per square inch"
 END
 
 // TYPES OF TEMPERATURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_TEMPERATURE_CELSIUS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TEMPERATURE_FAHRENHEIT      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TEMPERATURE_KELVIN          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TEMPERATURE_RANKINE         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "<22><><EFBFBD>"
-    IDS_TIME_HOURS        "<22><><EFBFBD><EFBFBD>"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_MILLISECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_MINUTES      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_SECONDS      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_WEEKS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_YEARS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_TEMPERATURE_CELSIUS         "Celsius"
+    IDS_TEMPERATURE_FAHRENHEIT      "Fahrenheit"
+    IDS_TEMPERATURE_KELVIN          "Kelvin"
+    IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>"
-    IDS_VELOCITY_FEET_HOUR          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>"
-    IDS_VELOCITY_FEET_SECOND        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_KILOMETERS_HOUR    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>"
-    IDS_VELOCITY_KNOTS              "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_MACH               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_METERS_SECOND      "<22><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_MILES_HOUR         "<22><><EFBFBD><EFBFBD>/<2F><><EFBFBD>"
+    IDS_VELOCITY_FEET_HOUR          "Feet/hour"
+    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
+    IDS_VELOCITY_KNOTS              "Knots"
+    IDS_VELOCITY_MACH               "Mach"
+    IDS_VELOCITY_METERS_SECOND      "Meters/second"
+    IDS_VELOCITY_MILES_HOUR         "Miles/hour"
 END
 
 // TYPES OF VOLUMES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) (<28><>)"
-    IDS_VOLUME_BARRELS_OIL          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_VOLUME_BARRELS_UK           "Barrels (UK)"
+    IDS_VOLUME_BARRELS_OIL          "Barrels oil"
     IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>)"
-    IDS_VOLUME_BUSHELS_US           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_FEET           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_INCHES         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_METERS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_YARDS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
+    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
+    IDS_VOLUME_CUBIC_CENTIMETERS    "Cubic centimeters"
+    IDS_VOLUME_CUBIC_FEET           "Cubic feet"
+    IDS_VOLUME_CUBIC_INCHES         "Cubic inches"
+    IDS_VOLUME_CUBIC_METERS         "Cubic meters"
+    IDS_VOLUME_CUBIC_YARDS          "Cubic yards"
     IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><>)"
-    IDS_VOLUME_FLUID_OUNCES_US      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_GALLONS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
+    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
+    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
+    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
+    IDS_VOLUME_GALLONS_DRY_US       "Gallons, dry (US)"
+    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liquid (US)"
     IDS_VOLUME_GOU                  "Gou"
     IDS_VOLUME_HOP                  "Hop"
     IDS_VOLUME_ICCE                 "Icce"
     IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_VOLUME_LITERS               "Liters"
     IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_PINTS_UK             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>)"
-    IDS_VOLUME_PINTS_DRY_US         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_PINTS_LIQUID_US      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_QUARTS_UK            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>)"
-    IDS_VOLUME_QUARTS_DRY_US        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
+    IDS_VOLUME_MILLILITERS          "Milliliters"
+    IDS_VOLUME_PINTS_UK             "Pints (UK)"
+    IDS_VOLUME_PINTS_DRY_US         "Pints, dry (US)"
+    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquid (US)"
+    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
+    IDS_VOLUME_QUARTS_DRY_US        "Quarts, dry (US)"
+    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquid (US)"
     IDS_VOLUME_SEKI                 "Seki"
     IDS_VOLUME_SYOU                 "Syou"
     IDS_VOLUME_TANANLOUNG           "Tananloung"
@@ -704,29 +671,29 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_WEIGHT_CARATS               "Carats"
     IDS_WEIGHT_CHUNG                "Chung"
     IDS_WEIGHT_DON                  "Don"
     IDS_WEIGHT_GEUN                 "Geun"
     IDS_WEIGHT_GRAMS                "Grams"
     IDS_WEIGHT_GWAN                 "Gwan"
     IDS_WEIGHT_HARB                 "Harb"
-    IDS_WEIGHT_JIN_CHINA            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_JIN_TAIWAN           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
+    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
+    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
     IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_WEIGHT_KILOGRAMS            "Kilograms"
     IDS_WEIGHT_KIN                  "Kin"
     IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
     IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
     IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_POUNDS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_QUINTAL_METRIC       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
+    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
+    IDS_WEIGHT_POUNDS               "Pounds"
+    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
     IDS_WEIGHT_SALOUNG              "Saloung"
-    IDS_WEIGHT_STONES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_WEIGHT_STONES               "Stones"
     IDS_WEIGHT_TAMLUNG              "Tamlung"
-    IDS_WEIGHT_TONNES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_TONS_UK              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>)"
-    IDS_WEIGHT_TONS_US              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
+    IDS_WEIGHT_TONNES               "Tonnes"
+    IDS_WEIGHT_TONS_UK              "Tons (UK)"
+    IDS_WEIGHT_TONS_US              "Tons (US)"
 END

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

@@ -1,6 +1,6 @@
 /* FILE:        base/applications/calc/lang/cs-CZ.rc
  * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:     2009-01-25
+ * UPDATED:     2008-06-28
  */
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -8,7 +8,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 // Dialog
 
 IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS kalkula<6C>ka"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -164,7 +164,7 @@ BEGIN
 END
 
 IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkula<6C>ka"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -231,7 +231,7 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkula<6C>ka"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
@@ -309,7 +309,7 @@ BEGIN
 END
 
 IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "O ReactOS Kalkula<6C>ce"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -328,7 +328,7 @@ BEGIN
 END
 
 IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistick<63> v<>po<70>ty"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -368,7 +368,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Seskupov<6F>n<EFBFBD> <20><>slic",          IDM_VIEW_GROUP, CHECKED
     END
-    POPUP "N<EFBFBD>pov<EFBFBD>da"
+    POPUP "Help"
     BEGIN
         MENUITEM "T<>mata n<>pov<6F>dy",             IDM_HELP_HELP
         MENUITEM SEPARATOR
@@ -401,7 +401,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Seskupov<6F>n<EFBFBD> <20><>slic",          IDM_VIEW_GROUP, CHECKED
     END
-    POPUP "N<EFBFBD>pov<EFBFBD>da"
+    POPUP "Help"
     BEGIN
         MENUITEM "T<>mata n<>pov<6F>dy",             IDM_HELP_HELP
         MENUITEM SEPARATOR
@@ -416,19 +416,19 @@ BEGIN
         MENUITEM "Kop<6F>rovat\tCTRL-C",           IDM_EDIT_COPY
         MENUITEM "Vlo<6C>it\tCTRL-V",              IDM_EDIT_PASTE
     END
-    POPUP "Zobrazit"
+    POPUP "View"
     BEGIN
         MENUITEM "Standardn<64>",                  IDM_VIEW_STANDARD, CHECKED
         MENUITEM "V<>deck<63>",                     IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "P<>evody",                     IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Seskupov<6F>n<EFBFBD> <20><>slic",          IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Seskupov<6F>n<EFBFBD> <20><>slic",                IDM_VIEW_GROUP, CHECKED
     END
-    POPUP "N<EFBFBD>pov<EFBFBD>da"
+    POPUP "Help"
     BEGIN
-        MENUITEM "T<>mata n<>pov<6F>dy",             IDM_HELP_HELP
+        MENUITEM "T<>mata n<>pov<6F>dy",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "O ReactOS kalkula<6C>ce",        IDM_HELP_ABOUT
+        MENUITEM "O ReactOS kalkula<6C>ce",          IDM_HELP_ABOUT
     END
 END
 
@@ -444,7 +444,6 @@ END
 // types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_TIME           "<22>as"
     IDS_CONV_LENGTH         "D<>lka"
     IDS_CONV_ENERGY         "Energie"
     IDS_CONV_WEIGHT         "Hmotnost"
@@ -452,21 +451,12 @@ BEGIN
     IDS_CONV_VOLUME         "Objem"
     IDS_CONV_AREA           "Plocha"
     IDS_CONV_VELOCITY       "Rychlost"
-    IDS_CONV_CONSUMPTION    "Spot<6F>eba"
+    IDS_CONV_CONSUMPTION    "Spot<6F>eba (motory)"
     IDS_CONV_TEMPERATURE    "Teplota"
     IDS_CONV_PRESSURE       "Tlak"
-    IDS_CONV_ANGLE          "<22>hel"
     IDS_CONV_POWER          "V<>kon"
 END
 
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_GRADIANS      "Grady"
-    IDS_ANGLE_RADIANS       "Radi<64>ny"
-    IDS_ANGLE_DEGREES       "Stupn<70>"
-END
-
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -518,8 +508,8 @@ END
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
+
     IDS_CURRENCY_BELGIAN_FRANC      "Belgick<63> frank"
-    IDS_CURRENCY_CZECH_KORUNA       "<22>esk<73> koruna"
     IDS_CURRENCY_EURO               "Euro"
     IDS_CURRENCY_FINNISH_MARKKA     "Finsk<73> marka"
     IDS_CURRENCY_FRENCH_FRANC       "Francouzsk<73> frank"
@@ -533,7 +523,6 @@ BEGIN
     IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portugalsk<73> escudo"
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakousk<73> <20>ilink"
     IDS_CURRENCY_GREEK_DRACHMA      "<22>eck<63> drachma"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slovensk<73> koruna"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovinsk<73> tolar"
     IDS_CURRENCY_SPANISH_PESETA     "<22>pan<61>lsk<73> peseta"
 END
@@ -541,16 +530,12 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <EFBFBD>C kalorie"
-    IDS_ENERGY_BTUS                 "Britsk<73> term<72>ln<6C> jednotky"
-    IDS_ENERGY_EVS                  "Elektronvolty"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C kalorie"
     IDS_ENERGY_ERGS                 "Ergy"
     IDS_ENERGY_JOULES               "Jouly"
     IDS_ENERGY_KILOJOULES           "Kilojouly"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hodiny"
     IDS_ENERGY_IT_CALORIES          "Mezin<69>rodn<64> kalorie"
-    IDS_ENERGY_IT_KILOCALORIES      "Mezin<69>rodn<64> kilokalorie"
     IDS_ENERGY_NUTRITION_CALORIES   "Nutri<72>n<EFBFBD> kalorie"
     IDS_ENERGY_TH_CALORIES          "Termochemick<63> kalorie"
 END
@@ -559,7 +544,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LENGTH_ANGSTROMS            "Angstr<74>my"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomick<63> jednotky"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomick<63> jednotky"
     IDS_LENGTH_BARLEYCORNS          "Barleycorny"
     IDS_LENGTH_CENTIMETERS          "Centimetry"
     IDS_LENGTH_CHAINS_UK            "Chains (Gunter's chains) (UK)"
@@ -582,7 +567,6 @@ BEGIN
     IDS_LENGTH_LAR                  "Lar"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Metry"
-    IDS_LENGTH_MICRONS              "Mikrony"
     IDS_LENGTH_MILES                "M<>le"
     IDS_LENGTH_MILLIMETERS          "Milimetry"
     IDS_LENGTH_NAUTICAL_MILES       "N<>mo<6D>n<EFBFBD> m<>le"
@@ -592,7 +576,6 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japonsko)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -610,8 +593,6 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "Britsk<73> term<72>ln<6C> jednotky za minutu"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds za minutu"
     IDS_POWER_HORSEPOWER            "Ko<4B>sk<73> s<>ly"
     IDS_POWER_KILOWATTS             "Kilowatty"
     IDS_POWER_MEGAWATTS             "Megawatty"
@@ -623,8 +604,6 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosf<73>ry"
     IDS_PRESSURE_BARS               "Bary"
-    IDS_PRESSURE_HECTOPASCALS       "Hektopascaly"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascaly"
     IDS_PRESSURE_PSI                "Libry na <20>tvercov<6F> palec"
     IDS_PRESSURE_MM_OF_MERCURY      "Milimetry rtu<74>ov<6F>ho sloupce"
     IDS_PRESSURE_PASCALS            "Pascaly"
@@ -639,30 +618,14 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankina"
 END
 
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Dny"
-    IDS_TIME_HOURS        "Hodiny"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Mikrosekundy"
-    IDS_TIME_MILLISECONDS "Milisekundy"
-    IDS_TIME_MINUTES      "Minuty"
-    IDS_TIME_SECONDS      "Sekundy"
-    IDS_TIME_YEARS        "Roky"
-    IDS_TIME_WEEKS        "T<>dny"
-END
-
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimetry za hodinu"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometry za hodinu"
+    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometry/hodinu"
     IDS_VELOCITY_MACH               "Machy"
-    IDS_VELOCITY_METERS_SECOND      "Metry za sekundu"
-    IDS_VELOCITY_MILES_HOUR         "M<>le za hodinu"
-    IDS_VELOCITY_FEET_HOUR          "Stopy za hodinu"
-    IDS_VELOCITY_FEET_SECOND        "Stopy za sekundu"
+    IDS_VELOCITY_METERS_SECOND      "Metry/sekundu"
+    IDS_VELOCITY_MILES_HOUR         "M<>le/hodinu"
+    IDS_VELOCITY_FEET_HOUR          "Stopy/hodinu"
     IDS_VELOCITY_KNOTS              "Uzly"
 END
 

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

@@ -9,10 +9,14 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dez",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Dez",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -226,7 +230,7 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Rechner"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
@@ -324,7 +328,7 @@ END
 
 IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Statistikbox"
+CAPTION "Statistik Box"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
@@ -337,6 +341,7 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -450,26 +455,16 @@ BEGIN
     IDS_CONV_CONSUMPTION    "Verbrauch (Motoren)"
     IDS_CONV_VOLUME         "Volumeneinheit"
     IDS_CONV_CURRENCY       "W<>hrung"
-    IDS_CONV_ANGLE          "Winkel"
-    IDS_CONV_TIME           "Zeit"
-END
-
-// WINKELTYPEN
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_GRADIANS      "Gon"
-    IDS_ANGLE_DEGREES       "Grad"
-    IDS_ANGLE_RADIANS       "Radiant"
 END
 
 // FL<46>CHENTYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_AREA_ACRES                  "Acre"
-    IDS_AREA_ACRES_BRAZIL           "Acre (Brasilien)"
-    IDS_AREA_ACRES_FRANCE           "Acre (Frankreich)"
-    IDS_AREA_ACRES_SCOTS            "Acre (Schottland)"
-    IDS_AREA_ACRES_US               "Acre (USA)"
+    IDS_AREA_ACRES                  "Acres"
+    IDS_AREA_ACRES_BRAZIL           "Acres (Brasilien)"
+    IDS_AREA_ACRES_FRANCE           "Acres (Frankreich)"
+    IDS_AREA_ACRES_SCOTS            "Acres (Schottland)"
+    IDS_AREA_ACRES_US               "Acres (USA)"
     IDS_AREA_ARES                   "Ar"
     IDS_AREA_CHOU                   "Chou"
     IDS_AREA_DANBO                  "Danbo"
@@ -482,21 +477,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CHR             "Quadratchr"
-    IDS_AREA_SQUARE_FATHOMS         "Quadratfathom"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Quadratfathom (Ungarn)"
-    IDS_AREA_SQUARE_FEET            "Quadratfu<EFBFBD>"
-    IDS_AREA_SQUARE_KILOMETERS      "Quadratkilometer"
-    IDS_AREA_SQUARE_LAR             "Quadratlar"
-    IDS_AREA_SQUARE_METER           "Quadratmeter"
-    IDS_AREA_SQUARE_MILES           "Quadratmeilen"
-    IDS_AREA_SQUARE_MILLIMETERS     "Quadratmillimeter"
-    IDS_AREA_SQUARE_SHAKU           "Quadratshaku"
-    IDS_AREA_SQUARE_TSUEN           "Quadrattsuen"
-    IDS_AREA_SQUARE_VA              "Quadratva"
-    IDS_AREA_SQUARE_YARD            "Quadratyard"
+    IDS_AREA_SQUARE_CHR             "Qaudratchr"
+    IDS_AREA_SQUARE_FATHOMS         "Qaudratfathom"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Qaudratfathom (Ungarn)"
+    IDS_AREA_SQUARE_FEET            "Qaudratfu<EFBFBD>"
+    IDS_AREA_SQUARE_KILOMETERS      "Qaudratkilometer"
+    IDS_AREA_SQUARE_LAR             "Qaudratlar"
+    IDS_AREA_SQUARE_METER           "Qaudratmeter"
+    IDS_AREA_SQUARE_MILES           "Qaudratmeilen"
+    IDS_AREA_SQUARE_MILLIMETERS     "Qaudratmillimeter"
+    IDS_AREA_SQUARE_SHAKU           "Qaudratshaku"
+    IDS_AREA_SQUARE_TSUEN           "Qaudrattsuen"
+    IDS_AREA_SQUARE_VA              "Qaudratva"
+    IDS_AREA_SQUARE_YARD            "Qaudratyard"
     IDS_AREA_SQUARE_CENTIMETERS     "Quadratzentimeter"
-    IDS_AREA_SQUARE_INCHES          "Quadratzoll"
+    IDS_AREA_SQUARE_INCHES          "Qaudratzoll"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -517,7 +512,7 @@ BEGIN
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_EURO               "Euro"
     IDS_CURRENCY_FINNISH_MARKKA     "Finnische Mark"
-    IDS_CURRENCY_FRENCH_FRANC       "Franz<6E>schische Franc"
+    IDS_CURRENCY_FRENCH_FRANC       "Franz<6E>schishe Franc"
     IDS_CURRENCY_GREEK_DRACHMA      "Griechische Drachme"
     IDS_CURRENCY_IRISH_POUND        "Irische Pfund"
     IDS_CURRENCY_ITALIAN_LIRA       "Italienische Lire"
@@ -526,24 +521,18 @@ BEGIN
     IDS_CURRENCY_DUTCH_GUILDER      "Niederl<72>ndische Guilder"
     IDS_CURRENCY_AUSTRIAN_SCHILLING "<22>sterreichische Schilling"
     IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portugiesische Escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slowakische Krone"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenische Tolar"
     IDS_CURRENCY_SPANISH_PESETA     "Spanische Peseta"
-    IDS_CURRENCY_CZECH_KORUNA       "Tschechische Krone"
     IDS_CURRENCY_CYPRIOT_POUND      "Zypriotische Pfund"
 END
 
 // ENERGIETYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <EFBFBD>C Kalorien"
-    IDS_ENERGY_BTUS                 "British thermal unit"
-    IDS_ENERGY_EVS                  "Elektronenvolt"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C Kalorien"
     IDS_ENERGY_ERGS                 "Ergs"
     IDS_ENERGY_NUTRITION_CALORIES   "Ern<72>hrung Kalorien"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pound"
     IDS_ENERGY_IT_CALORIES          "International Kalorien"
-    IDS_ENERGY_IT_KILOCALORIES      "International Kilokalorien"
     IDS_ENERGY_JOULES               "Joules"
     IDS_ENERGY_KILOJOULES           "Kilojoules"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowattstunden"
@@ -554,7 +543,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LENGTH_ANGSTROMS            "Angstr<74>ms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomische Einheiten"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomische Einheiten"
     IDS_LENGTH_CHAINS_UK            "Chains (UK)"
     IDS_LENGTH_CHI                  "Chi"
     IDS_LENGTH_CHOU                 "Chou"
@@ -579,7 +568,6 @@ BEGIN
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_MILES                "Meilen"
     IDS_LENGTH_METERS               "Meter"
-    IDS_LENGTH_MICRONS              "Mikrometer"
     IDS_LENGTH_MILLIMETERS          "Millimeter"
     IDS_LENGTH_NAUTICAL_MILES       "Nautische Meilen"
     IDS_LENGTH_NIEU                 "Nieu"
@@ -587,7 +575,6 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -605,8 +592,6 @@ END
 // ARBEITSTYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "BTU pro Minute"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pound pro Minute"
     IDS_POWER_KILOWATTS             "Kilowatt"
     IDS_POWER_MEGAWATTS             "Megawatt"
     IDS_POWER_HORSEPOWER            "Pferdest<73>rken"
@@ -618,8 +603,6 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosph<70>ren"
     IDS_PRESSURE_BARS               "Bar"
-    IDS_PRESSURE_HECTOPASCALS       "Hektopascal"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascal"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimeter auf dem Quecksilber"
     IDS_PRESSURE_PASCALS            "Pascal"
     IDS_PRESSURE_PSI                "Pfunddruck pro Quadratzoll"
@@ -634,25 +617,9 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Tagen"
-    IDS_TIME_HOURS        "Stunden"
-    IDS_TIME_NANOSECONDS  "Nanosekunden"
-    IDS_TIME_MICROSECONDS "Mikrosekunden"
-    IDS_TIME_MILLISECONDS "Millisekunden"
-    IDS_TIME_MINUTES      "Minuten"
-    IDS_TIME_SECONDS      "Sekunden"
-    IDS_TIME_WEEKS        "Wochen"
-    IDS_TIME_YEARS        "Jahren"
-END
-
 // GESCHWINDIGKEITSTYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Zentimeter/Sekunde"
-    IDS_VELOCITY_FEET_SECOND        "Fu<46>/Sekunde"
     IDS_VELOCITY_FEET_HOUR          "Fu<46>/Stunde"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometer/Stunde"
     IDS_VELOCITY_KNOTS              "Knoten"

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

@@ -1,732 +0,0 @@
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-
-// Dialog
-
-IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-MENU IDR_MENU_SCIENTIFIC_1
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
-    GROUPBOX        "",IDC_STATIC,4,36,76,21
-    CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,8,44,26,10
-    CONTROL         "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,40,44,29,10
-    CTEXT           "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CTEXT           "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    GROUPBOX        "",IDC_STATIC,140,16,172,21
-    CONTROL         "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,148,24,37,10
-    CONTROL         "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,188,24,37,10
-    CONTROL         "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,232,24,33,10
-    CONTROL         "Byte",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,272,24,30,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24,
-                    42,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192,
-                    24,42,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
-                    236,24,44,10
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Back",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Back",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    CTEXT           "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON      "Convert",IDC_BUTTON_CONVERT,35,105,76,17
-    COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,4,20,56,8
-    COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Convert from:",IDC_STATIC,4,49,56,8
-    COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP | CBS_SORT
-    LTEXT           "Convert to:",IDC_STATIC,4,76,56,8
-    CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
-    CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
-                    BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
-                    40,17
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17
-    CONTROL         "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17
-    CONTROL         "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17
-    CONTROL         "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17
-    CONTROL         "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17
-    CONTROL         "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17
-    CONTROL         "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17
-    CONTROL         "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17
-    CONTROL         "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17
-    CONTROL         "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17
-    CONTROL         "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17
-    CONTROL         ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17
-    CONTROL         "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17
-    CONTROL         "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17
-    CONTROL         "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17
-    CONTROL         "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17
-    CONTROL         "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17
-    CONTROL         "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17
-    CONTROL         "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17
-    CONTROL         "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17
-    CTEXT           "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17
-    CONTROL         "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17
-    CONTROL         "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17
-    CONTROL         "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE
-END
-
-IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
-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           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,120,12,132,8,
-                    SS_CENTERIMAGE
-    LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE
-    LTEXT           "<22><><EFBFBD> <20><><EFBFBD> Carlo Bramini",IDC_STATIC,120,32,132,8,
-                    SS_CENTERIMAGE
-    GROUPBOX        "",IDC_STATIC,112,0,148,52
-    GROUPBOX        "",IDC_STATIC,4,56,256,88
-    EDITTEXT        IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | 
-                    WS_VSCROLL
-END
-
-IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Statistics box"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "RET",IDC_BUTTON_RET,4,48,36,16
-    PUSHBUTTON      "LOAD",IDC_BUTTON_LOAD,44,48,36,16
-    PUSHBUTTON      "CD",IDC_BUTTON_CD,84,48,36,16
-    PUSHBUTTON      "CAD",IDC_BUTTON_CAD,124,48,36,16
-    CTEXT           "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | 
-                    SS_SUNKEN
-END
-
-// Menus
-
-IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
-BEGIN
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
-    END
-    POPUP "View"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
-        MENUITEM "Decimal\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Octal\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binary\tF8",                  IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Degrees\tF2",                 IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radians\tF3",                 IDM_VIEW_RAD, CHECKED
-        MENUITEM "Gradians\tF4",                IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Group digits",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Help"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",          IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE 
-BEGIN
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
-    END
-    POPUP "View"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF5",                     IDM_VIEW_HEX, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF8",                  IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
-        MENUITEM "Byte\tF4",                    IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",          IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU DISCARDABLE 
-BEGIN
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
-    END
-    POPUP "View"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Help"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",          IDM_HELP_ABOUT
-    END
-END
-
-// String Tables
-
-STRINGTABLE DISCARDABLE 
-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          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_QUICKHELP           "Quick help"
-END
-
-// Types of conversion
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONV_ANGLE          "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_AREA           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_CONSUMPTION    "Consumption (engines)"
-    IDS_CONV_CURRENCY       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_ENERGY         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_LENGTH         "Lenghts"
-    IDS_CONV_POWER          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_PRESSURE       "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_TEMPERATURE    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_TIME           "<22><><EFBFBD>"
-    IDS_CONV_VELOCITY       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_VOLUME         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_WEIGHT         "Weights"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ANGLE_GRADIANS      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ANGLE_RADIANS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-// TYPES OF AREAS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_AREA_ACRES                  "Acres"
-    IDS_AREA_ACRES_BRAZIL           "Acres (Brazil)"
-    IDS_AREA_ACRES_FRANCE           "Acres (France)"
-    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
-    IDS_AREA_ACRES_US               "Acres (US)"
-    IDS_AREA_ARES                   "Ares"
-    IDS_AREA_CHOU                   "Chou"
-    IDS_AREA_DANBO                  "Danbo"
-    IDS_AREA_HECTARES               "Hectares"
-    IDS_AREA_JEONGBO                "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungary)"
-    IDS_AREA_MU                     "Mu"
-    IDS_AREA_PING                   "Ping"
-    IDS_AREA_PYEONG                 "Pyeong"
-    IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
-    IDS_AREA_RAI                    "Rai"
-    IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Square centimeters"
-    IDS_AREA_SQUARE_CHR             "Square chr"
-    IDS_AREA_SQUARE_FATHOMS         "Square fathoms"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
-    IDS_AREA_SQUARE_FEET            "Square feet"
-    IDS_AREA_SQUARE_INCHES          "Square inches"
-    IDS_AREA_SQUARE_KILOMETERS      "Square kilometers"
-    IDS_AREA_SQUARE_LAR             "Square lar"
-    IDS_AREA_SQUARE_METER           "Square meter"
-    IDS_AREA_SQUARE_MILES           "Square miles"
-    IDS_AREA_SQUARE_MILLIMETERS     "Square millimeters"
-    IDS_AREA_SQUARE_SHAKU           "Square shaku"
-    IDS_AREA_SQUARE_TSUEN           "Square tsuen"
-    IDS_AREA_SQUARE_VA              "Square va"
-    IDS_AREA_SQUARE_YARD            "Square yard"
-    IDS_AREA_TAN                    "Tan"
-    IDS_AREA_TSUBO                  "Tsubo"
-END
-
-// TYPES OF COMSUMPTIONS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
-    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometers"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
-END
-
-// TYPES OF CURRENCIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
-    IDS_CURRENCY_BELGIAN_FRANC      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_CYPRIOT_POUND      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_CZECH_KORUNA       "Czech koruna"
-    IDS_CURRENCY_DEUTSCHE_MARK      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
-    IDS_CURRENCY_EURO               "<22><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_FINNISH_MARKKA     "Finnish markka"
-    IDS_CURRENCY_FRENCH_FRANC       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_GREEK_DRACHMA      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_IRISH_POUND        "Irish pound"
-    IDS_CURRENCY_ITALIAN_LIRA       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxembourg franc"
-    IDS_CURRENCY_MALTESE_LIRA       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slovak koruna"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
-    IDS_CURRENCY_SPANISH_PESETA     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-// TYPES OF ENERGIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <20>C calories"
-    IDS_ENERGY_BTUS                 "British Thermal Units"
-    IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Electron-Volts"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
-    IDS_ENERGY_IT_CALORIES          "International Table calories"
-    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
-    IDS_ENERGY_JOULES               "Joules"
-    IDS_ENERGY_KILOJOULES           "Kilojoules"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
-    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calories"
-    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie"
-END
-
-// TYPES OF LENGTHS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angstroms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
-    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
-    IDS_LENGTH_CENTIMETERS          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
-    IDS_LENGTH_CHI                  "Chi"
-    IDS_LENGTH_CHOU                 "Chou"
-    IDS_LENGTH_CHR                  "Chr"
-    IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "Fathoms"
-    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Hungary)"
-    IDS_LENGTH_FEET                 "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FURLONGS             "Furlongs"
-    IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "Hands"
-    IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_JA                   "Ja"
-    IDS_LENGTH_JEONG                "Jeong"
-    IDS_LENGTH_KABIET               "Kabiet"
-    IDS_LENGTH_KEN                  "Ken"
-    IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Light years"
-    IDS_LENGTH_LINKS_UK             "Links (UK)"
-    IDS_LENGTH_METERS               "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MICRONS              "Microns"
-    IDS_LENGTH_MILES                "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MILLIMETERS          "Millimeters"
-    IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
-    IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parsecs"
-    IDS_LENGTH_PICAS                "Picas"
-    IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
-    IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
-    IDS_LENGTH_SAWK                 "Sawk"
-    IDS_LENGTH_SEN                  "Sen"
-    IDS_LENGTH_SHAKU                "Shaku"
-    IDS_LENGTH_SPAN                 "Span"
-    IDS_LENGTH_SUN                  "Sun"
-    IDS_LENGTH_TSUEN                "Tsuen"
-    IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_YOTE                 "Yote"
-    IDS_LENGTH_ZHANG                "Zhang"
-END
-
-// TYPES OF POWERS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
-    IDS_POWER_HORSEPOWER            "Horsepower"
-    IDS_POWER_KILOWATTS             "Kilowatts"
-    IDS_POWER_MEGAWATTS             "Megawatts"
-    IDS_POWER_WATTS                 "Watts"
-END
-
-// TYPE OF PRESSURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_BARS               "Bars"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
-    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
-    IDS_PRESSURE_PASCALS            "Pascals"
-    IDS_PRESSURE_PSI                "Pounds-force per square inch"
-END
-
-// TYPES OF TEMPERATURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TEMPERATURE_FAHRENHEIT      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TEMPERATURE_KELVIN          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TEMPERATURE_RANKINE         "Rankine"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_HOURS        "<22><><EFBFBD><EFBFBD>"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_MILLISECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_MINUTES      "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_SECONDS      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_WEEKS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_YEARS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-// TYPES OF VELOCITIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>"
-    IDS_VELOCITY_FEET_HOUR          "<22><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>"
-    IDS_VELOCITY_FEET_SECOND        "<22><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_KILOMETERS_HOUR    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>"
-    IDS_VELOCITY_KNOTS              "Knots"
-    IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "<22><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_MILES_HOUR         "<22><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>"
-END
-
-// TYPES OF VOLUMES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK           "Barrels (UK)"
-    IDS_VOLUME_BARRELS_OIL          "Barrels oil"
-    IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
-    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Cubic centimeters"
-    IDS_VOLUME_CUBIC_FEET           "Cubic feet"
-    IDS_VOLUME_CUBIC_INCHES         "Cubic inches"
-    IDS_VOLUME_CUBIC_METERS         "Cubic meters"
-    IDS_VOLUME_CUBIC_YARDS          "Cubic yards"
-    IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
-    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "Gallons, dry (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liquid (US)"
-    IDS_VOLUME_GOU                  "Gou"
-    IDS_VOLUME_HOP                  "Hop"
-    IDS_VOLUME_ICCE                 "Icce"
-    IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Liters"
-    IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Milliliters"
-    IDS_VOLUME_PINTS_UK             "Pints (UK)"
-    IDS_VOLUME_PINTS_DRY_US         "Pints, dry (US)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquid (US)"
-    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
-    IDS_VOLUME_QUARTS_DRY_US        "Quarts, dry (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquid (US)"
-    IDS_VOLUME_SEKI                 "Seki"
-    IDS_VOLUME_SYOU                 "Syou"
-    IDS_VOLUME_TANANLOUNG           "Tananloung"
-    IDS_VOLUME_TANG                 "Tang"
-    IDS_VOLUME_TO                   "To"
-END
-
-// TYPES OF WEIGHTS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Carats"
-    IDS_WEIGHT_CHUNG                "Chung"
-    IDS_WEIGHT_DON                  "Don"
-    IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Grams"
-    IDS_WEIGHT_GWAN                 "Gwan"
-    IDS_WEIGHT_HARB                 "Harb"
-    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
-    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
-    IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilograms"
-    IDS_WEIGHT_KIN                  "Kin"
-    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
-    IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
-    IDS_WEIGHT_POUNDS               "Pounds"
-    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
-    IDS_WEIGHT_SALOUNG              "Saloung"
-    IDS_WEIGHT_STONES               "Stones"
-    IDS_WEIGHT_TAMLUNG              "Tamlung"
-    IDS_WEIGHT_TONNES               "Tonnes"
-    IDS_WEIGHT_TONS_UK              "Tons (UK)"
-    IDS_WEIGHT_TONS_US              "Tons (US)"
-END

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

@@ -3,7 +3,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 
 IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Calculator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -159,7 +159,7 @@ BEGIN
 END
 
 IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -226,7 +226,7 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
@@ -304,7 +304,7 @@ BEGIN
 END
 
 IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Calc"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -323,7 +323,7 @@ BEGIN
 END
 
 IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -436,32 +436,22 @@ BEGIN
     IDS_QUICKHELP           "Quick help"
 END
 
-// Types of conversion
+// types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "Angle"
     IDS_CONV_AREA           "Area"
     IDS_CONV_CONSUMPTION    "Consumption (engines)"
     IDS_CONV_CURRENCY       "Currencies"
     IDS_CONV_ENERGY         "Energy"
-    IDS_CONV_LENGTH         "Lengths"
+    IDS_CONV_LENGTH         "Lenghts"
     IDS_CONV_POWER          "Power"
     IDS_CONV_PRESSURE       "Pressure"
     IDS_CONV_TEMPERATURE    "Temperature"
-    IDS_CONV_TIME           "Time"
     IDS_CONV_VELOCITY       "Velocity"
     IDS_CONV_VOLUME         "Volume"
     IDS_CONV_WEIGHT         "Weights"
 END
 
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Degrees"
-    IDS_ANGLE_GRADIANS      "Gradians"
-    IDS_ANGLE_RADIANS       "Radians"
-END
-
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -516,7 +506,6 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
     IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
-    IDS_CURRENCY_CZECH_KORUNA       "Czech koruna"
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
     IDS_CURRENCY_EURO               "Euro"
@@ -528,7 +517,6 @@ BEGIN
     IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
     IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slovak koruna"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
     IDS_CURRENCY_SPANISH_PESETA     "Spanish peseta"
 END
@@ -536,13 +524,9 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <EFBFBD>C calories"
-    IDS_ENERGY_BTUS                 "British Thermal Units"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
     IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Electron-Volts"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
     IDS_ENERGY_IT_CALORIES          "International Table calories"
-    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
     IDS_ENERGY_JOULES               "Joules"
     IDS_ENERGY_KILOJOULES           "Kilojoules"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
@@ -553,8 +537,8 @@ END
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "<EFBFBD>ngstr<EFBFBD>ms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
+    IDS_LENGTH_ANGSTROMS            "Angstroms"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomila units"
     IDS_LENGTH_BARLEYCORNS          "Barleycorns"
     IDS_LENGTH_CENTIMETERS          "Centimeters"
     IDS_LENGTH_CHAINS_UK            "Chains (UK)"
@@ -580,7 +564,6 @@ BEGIN
     IDS_LENGTH_LIGHT_YEARS          "Light years"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Meters"
-    IDS_LENGTH_MICRONS              "Microns"
     IDS_LENGTH_MILES                "Miles"
     IDS_LENGTH_MILLIMETERS          "Millimeters"
     IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
@@ -589,7 +572,6 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -605,8 +587,6 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
     IDS_POWER_HORSEPOWER            "Horsepower"
     IDS_POWER_KILOWATTS             "Kilowatts"
     IDS_POWER_MEGAWATTS             "Megawatts"
@@ -618,8 +598,6 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
     IDS_PRESSURE_BARS               "Bars"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
     IDS_PRESSURE_PASCALS            "Pascals"
     IDS_PRESSURE_PSI                "Pounds-force per square inch"
@@ -634,26 +612,10 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Days"
-    IDS_TIME_HOURS        "Hours"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Microseconds"
-    IDS_TIME_MILLISECONDS "Milliseconds"
-    IDS_TIME_MINUTES      "Minutes"
-    IDS_TIME_SECONDS      "Seconds"
-    IDS_TIME_WEEKS        "Weeks"
-    IDS_TIME_YEARS        "Years"
-END
-
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimeters/hour"
     IDS_VELOCITY_FEET_HOUR          "Feet/hour"
-    IDS_VELOCITY_FEET_SECOND        "Feet/second"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
     IDS_VELOCITY_KNOTS              "Knots"
     IDS_VELOCITY_MACH               "Mach"

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

@@ -1,6 +1,6 @@
 /*
- * Spanish Language resource file
- * Traducido por: Javier Remacha 2008
+ *Spanish Language resource file
+ * Traducido por: Javier Remacha 2007-12-31
  */
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -14,10 +14,14 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -231,21 +235,21 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    PUSHBUTTON      "Convertir",IDC_BUTTON_CONVERT,35,105,76,17
+    PUSHBUTTON      "Convert",IDC_BUTTON_CONVERT,35,105,76,17
     COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Categor<EFBFBD>a:",IDC_STATIC,4,20,56,8
+    LTEXT           "Category:",IDC_STATIC,4,20,56,8
     COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Convertir de:",IDC_STATIC,4,49,56,8
+    LTEXT           "Convert from:",IDC_STATIC,4,49,56,8
     COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP | CBS_SORT
-    LTEXT           "Convertir a:",IDC_STATIC,4,76,56,8
+    LTEXT           "Convert to:",IDC_STATIC,4,76,56,8
     CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
     CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
@@ -342,6 +346,7 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -389,10 +394,10 @@ BEGIN
         MENUITEM "Cient<6E>fica",                  IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversi<73>n",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Hexadecimal\tF5",             IDM_VIEW_HEX, CHECKED
+        MENUITEM "Hexadecimal\tF5",                     IDM_VIEW_HEX, CHECKED
         MENUITEM "Decimal\tF6",                 IDM_VIEW_DEC, CHECKED
         MENUITEM "Octal\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binario\tF8",                 IDM_VIEW_BIN, CHECKED
+        MENUITEM "Binario\tF8",                  IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
         MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
@@ -428,7 +433,7 @@ BEGIN
     BEGIN
         MENUITEM "Temas de ayuda",              IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Acerca de Calculadora ReactOS", IDM_HELP_ABOUT
+        MENUITEM "Acerca de Calculadora ReactOS",          IDM_HELP_ABOUT
     END
 END
 
@@ -441,63 +446,53 @@ BEGIN
     IDS_QUICKHELP           "Ayuda r<>pida"
 END
 
-// Types of conversion
+// types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "<EFBFBD>ngulo"
-    IDS_CONV_AREA           "<22>rea"
-    IDS_CONV_CONSUMPTION    "Consumo (motores)"
-    IDS_CONV_CURRENCY       "Monedas"
-    IDS_CONV_ENERGY         "Energ<EFBFBD>a"
-    IDS_CONV_LENGTH         "Longitud"
-    IDS_CONV_POWER          "Potencia"
-    IDS_CONV_PRESSURE       "Presi<73>n"
-    IDS_CONV_TEMPERATURE    "Temperatura"
-    IDS_CONV_TIME           "Tiempo"
-    IDS_CONV_VELOCITY       "Velocidad"
-    IDS_CONV_VOLUME         "Volumen"
-    IDS_CONV_WEIGHT         "Peso"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Grados sexagesimales"
-    IDS_ANGLE_GRADIANS      "Grados centesimales"
-    IDS_ANGLE_RADIANS       "Radianes"
+    IDS_CONV_AREA           "Area"
+    IDS_CONV_CONSUMPTION    "Consumption (engines)"
+    IDS_CONV_CURRENCY       "Currencies"
+    IDS_CONV_ENERGY         "Energy"
+    IDS_CONV_LENGTH         "Lenghts"
+    IDS_CONV_POWER          "Power"
+    IDS_CONV_PRESSURE       "Pressure"
+    IDS_CONV_TEMPERATURE    "Temperature"
+    IDS_CONV_VELOCITY       "Velocity"
+    IDS_CONV_VOLUME         "Volume"
+    IDS_CONV_WEIGHT         "Weights"
 END
 
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_AREA_ACRES                  "Acres"
-    IDS_AREA_ACRES_BRAZIL           "Acres (Brasil)"
-    IDS_AREA_ACRES_FRANCE           "Acres (Francia)"
-    IDS_AREA_ACRES_SCOTS            "Acres (Escocia)"
+    IDS_AREA_ACRES_BRAZIL           "Acres (Brazil)"
+    IDS_AREA_ACRES_FRANCE           "Acres (France)"
+    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
     IDS_AREA_ACRES_US               "Acres (US)"
-    IDS_AREA_ARES                   "<EFBFBD>rea"
+    IDS_AREA_ARES                   "Ares"
     IDS_AREA_CHOU                   "Chou"
     IDS_AREA_DANBO                  "Danbo"
-    IDS_AREA_HECTARES               "Hect<EFBFBD>rias"
+    IDS_AREA_HECTARES               "Hectares"
     IDS_AREA_JEONGBO                "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungr<EFBFBD>a)"
+    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungary)"
     IDS_AREA_MU                     "Mu"
     IDS_AREA_PING                   "Ping"
     IDS_AREA_PYEONG                 "Pyeong"
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Cent<EFBFBD>metros cuadrados"
+    IDS_AREA_SQUARE_CENTIMETERS     "Square centimeters"
     IDS_AREA_SQUARE_CHR             "Square chr"
-    IDS_AREA_SQUARE_FATHOMS         "Braza cuadrada"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Braza cuadrada (Hungr<EFBFBD>a)"
-    IDS_AREA_SQUARE_FEET            "Pies cuadrados"
-    IDS_AREA_SQUARE_INCHES          "Pulgadas cuadradas"
-    IDS_AREA_SQUARE_KILOMETERS      "Kil<EFBFBD>metros cuadrados"
+    IDS_AREA_SQUARE_FATHOMS         "Square fathoms"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
+    IDS_AREA_SQUARE_FEET            "Square feet"
+    IDS_AREA_SQUARE_INCHES          "Square inches"
+    IDS_AREA_SQUARE_KILOMETERS      "Square kilometers"
     IDS_AREA_SQUARE_LAR             "Square lar"
-    IDS_AREA_SQUARE_METER           "Metros cuadrado"
-    IDS_AREA_SQUARE_MILES           "Millas cuadradas"
-    IDS_AREA_SQUARE_MILLIMETERS     "Mil<EFBFBD>metros cuadrados"
+    IDS_AREA_SQUARE_METER           "Square meter"
+    IDS_AREA_SQUARE_MILES           "Square miles"
+    IDS_AREA_SQUARE_MILLIMETERS     "Square millimeters"
     IDS_AREA_SQUARE_SHAKU           "Square shaku"
     IDS_AREA_SQUARE_TSUEN           "Square tsuen"
     IDS_AREA_SQUARE_VA              "Square va"
@@ -509,92 +504,84 @@ END
 // TYPES OF COMSUMPTIONS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometros/litro"
-    IDS_CONSUMPTION_L_PER_100_KM    "Litros/100 kilometros"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Millas/gal<EFBFBD>n (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Millas/gal<EFBFBD>n (US)"
+    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
+    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometers"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
+    IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
 END
 
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Schilling Austriaco"
-    IDS_CURRENCY_BELGIAN_FRANC      "Franco Belga"
-    IDS_CURRENCY_CYPRIOT_POUND      "Libra Chipriota"
-    IDS_CURRENCY_CZECH_KORUNA       "Corona Checa"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Marco Alem<65>n"
-    IDS_CURRENCY_DUTCH_GUILDER      "Flor<6F>n Neerland<6E>s"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
+    IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
+    IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
+    IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
+    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
     IDS_CURRENCY_EURO               "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA     "Marco Finland<6E>s"
-    IDS_CURRENCY_FRENCH_FRANC       "Franco Frances"
-    IDS_CURRENCY_GREEK_DRACHMA      "Drachma Griego"
-    IDS_CURRENCY_IRISH_POUND        "Libra Irlandesa"
-    IDS_CURRENCY_ITALIAN_LIRA       "Lira Italiana"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "Franco Luxemburgu<EFBFBD>s"
-    IDS_CURRENCY_MALTESE_LIRA       "Lira Maltesa"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Escudo Portugu<EFBFBD>s"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Corona Eslovaca"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Tolar Esloveno"
-    IDS_CURRENCY_SPANISH_PESETA     "Peseta Espa<70>ola"
+    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_LUXEMBOURG_FRANC   "Luxembourg franc"
+    IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
+    IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
+    IDS_CURRENCY_SPANISH_PESETA     "Spanish peseta"
 END
 
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <EFBFBD>C calor<EFBFBD>as"
-    IDS_ENERGY_BTUS                 "BTU"
-    IDS_ENERGY_ERGS                 "Ergios"
-    IDS_ENERGY_EVS                  "Electronovoltios"
-    IDS_ENERGY_FOOT_POUNDS          "Ft<EFBFBD>Lbs"
-    IDS_ENERGY_IT_CALORIES          "Tabla internacional de calor<6F>as"
-    IDS_ENERGY_IT_KILOCALORIES      "Tabla internacional de kilocalor<EFBFBD>as"
-    IDS_ENERGY_JOULES               "Julios"
-    IDS_ENERGY_KILOJOULES           "Kilojulios"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatios hora"
-    IDS_ENERGY_NUTRITION_CALORIES   "Calor<6F>as nutricionales"
-    IDS_ENERGY_TH_CALORIES          "Calor<6F>as termoqu<71>micas"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
+    IDS_ENERGY_ERGS                 "Ergs"
+    IDS_ENERGY_IT_CALORIES          "International Table calories"
+    IDS_ENERGY_JOULES               "Joules"
+    IDS_ENERGY_KILOJOULES           "Kilojoules"
+    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
+    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calories"
+    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie"
 END
 
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "<EFBFBD>ngstr<EFBFBD>ms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
+    IDS_LENGTH_ANGSTROMS            "Angstroms"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomila units"
     IDS_LENGTH_BARLEYCORNS          "Barleycorns"
-    IDS_LENGTH_CENTIMETERS          "Cent<EFBFBD>metros"
-    IDS_LENGTH_CHAINS_UK            "Cadenas (UK)"
+    IDS_LENGTH_CENTIMETERS          "Centimeters"
+    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
     IDS_LENGTH_CHI                  "Chi"
     IDS_LENGTH_CHOU                 "Chou"
     IDS_LENGTH_CHR                  "Chr"
     IDS_LENGTH_CUN                  "Cun"
     IDS_LENGTH_FATHOMS              "Fathoms"
     IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Hungary)"
-    IDS_LENGTH_FEET                 "Pies"
+    IDS_LENGTH_FEET                 "Feet"
     IDS_LENGTH_FURLONGS             "Furlongs"
     IDS_LENGTH_GAN                  "Gan"
     IDS_LENGTH_HANDS                "Hands"
     IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Pulgadas"
+    IDS_LENGTH_INCHES               "Inches"
     IDS_LENGTH_JA                   "Ja"
     IDS_LENGTH_JEONG                "Jeong"
     IDS_LENGTH_KABIET               "Kabiet"
     IDS_LENGTH_KEN                  "Ken"
     IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "Kilometros"
+    IDS_LENGTH_KILOMETERS           "Kilometers"
     IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "A<EFBFBD>os luz"
+    IDS_LENGTH_LIGHT_YEARS          "Light years"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
-    IDS_LENGTH_METERS               "Metros"
-    IDS_LENGTH_MICRONS              "Micr<EFBFBD>metros"
-    IDS_LENGTH_MILES                "Millas"
-    IDS_LENGTH_MILLIMETERS          "Mil<69>metros"
-    IDS_LENGTH_NAUTICAL_MILES       "Millas nauticas"
+    IDS_LENGTH_METERS               "Meters"
+    IDS_LENGTH_MILES                "Miles"
+    IDS_LENGTH_MILLIMETERS          "Millimeters"
+    IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
     IDS_LENGTH_NIEU                 "Nieu"
     IDS_LENGTH_PARSECS              "Parsecs"
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -610,24 +597,20 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "BTU/Minuto"
-    IDS_POWER_FPS_PER_MINUTE        "Ft<46>Lbs/Minuto"
-    IDS_POWER_HORSEPOWER            "Caballos de vapor"
-    IDS_POWER_KILOWATTS             "Kilowatios"
-    IDS_POWER_MEGAWATTS             "Megawatios"
-    IDS_POWER_WATTS                 "Watios"
+    IDS_POWER_HORSEPOWER            "Horsepower"
+    IDS_POWER_KILOWATTS             "Kilowatts"
+    IDS_POWER_MEGAWATTS             "Megawatts"
+    IDS_POWER_WATTS                 "Watts"
 END
 
 // TYPE OF PRESSURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atm<EFBFBD>sferas"
-    IDS_PRESSURE_BARS               "Bares"
-    IDS_PRESSURE_HECTOPASCALS       "Kilopascales"
-    IDS_PRESSURE_KILOPASCALS        "Hectopascales"
-    IDS_PRESSURE_MM_OF_MERCURY      "Mil<69>metros de mercurio"
-    IDS_PRESSURE_PASCALS            "Pascales"
-    IDS_PRESSURE_PSI                "Libras fuerza por pulgada cuadrada"
+    IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
+    IDS_PRESSURE_BARS               "Bars"
+    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
+    IDS_PRESSURE_PASCALS            "Pascals"
+    IDS_PRESSURE_PSI                "Pounds-force per square inch"
 END
 
 // TYPES OF TEMPERATURES
@@ -639,65 +622,49 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "D<>as"
-    IDS_TIME_HOURS        "Horas"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Microsegundos"
-    IDS_TIME_MILLISECONDS "Milisegundos"
-    IDS_TIME_MINUTES      "Minutos"
-    IDS_TIME_SECONDS      "Segundos"
-    IDS_TIME_WEEKS        "Semanas"
-    IDS_TIME_YEARS        "A<>os"
-END
-
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Cent<6E>metros/segundo"
-    IDS_VELOCITY_FEET_HOUR          "Pies/hora"
-    IDS_VELOCITY_FEET_SECOND        "Pies/segundo"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometros/hora"
+    IDS_VELOCITY_FEET_HOUR          "Feet/hour"
+    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
     IDS_VELOCITY_KNOTS              "Knots"
     IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "Metros/segundo"
-    IDS_VELOCITY_MILES_HOUR         "Millas/hora"
+    IDS_VELOCITY_METERS_SECOND      "Meters/second"
+    IDS_VELOCITY_MILES_HOUR         "Miles/hour"
 END
 
 // TYPES OF VOLUMES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK           "Barriles (UK)"
-    IDS_VOLUME_BARRELS_OIL          "Barriles de petroleo"
+    IDS_VOLUME_BARRELS_UK           "Barrels (UK)"
+    IDS_VOLUME_BARRELS_OIL          "Barrels oil"
     IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Celem<EFBFBD>n (UK)"
-    IDS_VOLUME_BUSHELS_US           "Celem<EFBFBD>n (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Cent<EFBFBD>metros c<>bicos"
-    IDS_VOLUME_CUBIC_FEET           "P<EFBFBD>es c<>bicos"
-    IDS_VOLUME_CUBIC_INCHES         "Pulgadas c<>bicas"
-    IDS_VOLUME_CUBIC_METERS         "Metros c<>bicos"
-    IDS_VOLUME_CUBIC_YARDS          "Yardas c<>bicas"
+    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
+    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
+    IDS_VOLUME_CUBIC_CENTIMETERS    "Cubic centimeters"
+    IDS_VOLUME_CUBIC_FEET           "Cubic feet"
+    IDS_VOLUME_CUBIC_INCHES         "Cubic inches"
+    IDS_VOLUME_CUBIC_METERS         "Cubic meters"
+    IDS_VOLUME_CUBIC_YARDS          "Cubic yards"
     IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Onza l<>quida (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Onza l<>quida (US)"
-    IDS_VOLUME_GALLONS_UK           "Galones (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "Galones, dry (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Galones, liquid (US)"
+    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
+    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
+    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
+    IDS_VOLUME_GALLONS_DRY_US       "Gallons, dry (US)"
+    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liquid (US)"
     IDS_VOLUME_GOU                  "Gou"
     IDS_VOLUME_HOP                  "Hop"
     IDS_VOLUME_ICCE                 "Icce"
     IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Litros"
+    IDS_VOLUME_LITERS               "Liters"
     IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Mililitros"
-    IDS_VOLUME_PINTS_UK             "Pintas (UK)"
-    IDS_VOLUME_PINTS_DRY_US         "Pintas, dry (US)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pintas, liquid (US)"
-    IDS_VOLUME_QUARTS_UK            "Cuartos (UK)"
-    IDS_VOLUME_QUARTS_DRY_US        "Cuartos, dry (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Cuartos, liquid (US)"
+    IDS_VOLUME_MILLILITERS          "Milliliters"
+    IDS_VOLUME_PINTS_UK             "Pints (UK)"
+    IDS_VOLUME_PINTS_DRY_US         "Pints, dry (US)"
+    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquid (US)"
+    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
+    IDS_VOLUME_QUARTS_DRY_US        "Quarts, dry (US)"
+    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquid (US)"
     IDS_VOLUME_SEKI                 "Seki"
     IDS_VOLUME_SYOU                 "Syou"
     IDS_VOLUME_TANANLOUNG           "Tananloung"
@@ -709,29 +676,29 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Quilates"
+    IDS_WEIGHT_CARATS               "Carats"
     IDS_WEIGHT_CHUNG                "Chung"
     IDS_WEIGHT_DON                  "Don"
     IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Gramos"
+    IDS_WEIGHT_GRAMS                "Grams"
     IDS_WEIGHT_GWAN                 "Gwan"
     IDS_WEIGHT_HARB                 "Harb"
     IDS_WEIGHT_JIN_CHINA            "Jin (China)"
     IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
     IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilogramos"
+    IDS_WEIGHT_KILOGRAMS            "Kilograms"
     IDS_WEIGHT_KIN                  "Kin"
     IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
     IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
     IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Onza, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Onza, troy"
-    IDS_WEIGHT_POUNDS               "Libras"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
+    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
+    IDS_WEIGHT_POUNDS               "Pounds"
     IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
     IDS_WEIGHT_SALOUNG              "Saloung"
     IDS_WEIGHT_STONES               "Stones"
     IDS_WEIGHT_TAMLUNG              "Tamlung"
-    IDS_WEIGHT_TONNES               "Toneladas"
-    IDS_WEIGHT_TONS_UK              "Toneladas (UK)"
-    IDS_WEIGHT_TONS_US              "Toneladas (US)"
+    IDS_WEIGHT_TONNES               "Tonnes"
+    IDS_WEIGHT_TONS_UK              "Tons (UK)"
+    IDS_WEIGHT_TONS_US              "Tons (US)"
 END

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

@@ -1,732 +0,0 @@
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-// Dialog
-
-IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice ReactOS"
-MENU IDR_MENU_SCIENTIFIC_1
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
-    GROUPBOX        "",IDC_STATIC,4,36,76,21
-    CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,8,44,26,10
-    CONTROL         "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,40,44,29,10
-    CTEXT           "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CTEXT           "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    GROUPBOX        "",IDC_STATIC,140,16,172,21
-    CONTROL         "Q-mot",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,148,24,37,10
-    CONTROL         "D-mot",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,188,24,37,10
-    CONTROL         "Mot",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,232,24,33,10
-    CONTROL         "Octet",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,272,24,30,10
-    CONTROL         "Degr<67>s",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24,
-                    42,10
-    CONTROL         "Radians",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192,
-                    24,42,10
-    CONTROL         "Grades",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
-                    236,24,44,10
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Retour arri<72>re",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice ReactOS"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Retour arri<72>re",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    CTEXT           "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice ReactOS"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON      "Convertir",IDC_BUTTON_CONVERT,35,105,76,17
-    COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Cat<61>gorie :",IDC_STATIC,4,20,56,8
-    COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Convertir depuis :",IDC_STATIC,4,49,56,8
-    COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP | CBS_SORT
-    LTEXT           "Convertir en :",IDC_STATIC,4,76,56,8
-    CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
-    CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "Retour arri<72>re",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
-                    BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
-                    40,17
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17
-    CONTROL         "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17
-    CONTROL         "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17
-    CONTROL         "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17
-    CONTROL         "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17
-    CONTROL         "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17
-    CONTROL         "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17
-    CONTROL         "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17
-    CONTROL         "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17
-    CONTROL         "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17
-    CONTROL         "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17
-    CONTROL         ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17
-    CONTROL         "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17
-    CONTROL         "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17
-    CONTROL         "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17
-    CONTROL         "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17
-    CONTROL         "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17
-    CONTROL         "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17
-    CONTROL         "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17
-    CONTROL         "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17
-    CTEXT           "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17
-    CONTROL         "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17
-    CONTROL         "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17
-    CONTROL         "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE
-END
-
-IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22> 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,4,56,256,88
-    EDITTEXT        IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | 
-                    WS_VSCROLL
-END
-
-IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Statistiques"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "RET",IDC_BUTTON_RET,4,48,36,16
-    PUSHBUTTON      "LOAD",IDC_BUTTON_LOAD,44,48,36,16
-    PUSHBUTTON      "CD",IDC_BUTTON_CD,84,48,36,16
-    PUSHBUTTON      "CAD",IDC_BUTTON_CAD,124,48,36,16
-    CTEXT           "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | 
-                    SS_SUNKEN
-END
-
-// Menus
-
-IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
-BEGIN
-    POPUP "<22>dition"
-    BEGIN
-        MENUITEM "Copier\tCTRL-C",              IDM_EDIT_COPY
-        MENUITEM "Coller\tCTRL-V",              IDM_EDIT_PASTE
-    END
-    POPUP "Affichage"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifique",                IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Conversion",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Hexad<61>cimal\tF5",             IDM_VIEW_HEX, CHECKED
-        MENUITEM "D<>cimal\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Octal\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binaire\tF8",                 IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Degr<67>s\tF2",                  IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radians\tF3",                 IDM_VIEW_RAD, CHECKED
-        MENUITEM "Grades\tF4",                  IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grouper les chiffres",        IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Aide"
-    BEGIN
-        MENUITEM "Rubriques d'aide",            IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22> propos de la Calculatrice ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE 
-BEGIN
-    POPUP "<22>dition"
-    BEGIN
-        MENUITEM "Copier\tCTRL-C",              IDM_EDIT_COPY
-        MENUITEM "Coller\tCTRL-V",              IDM_EDIT_PASTE
-    END
-    POPUP "Affichage"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifique",                IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Conversion",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Hexad<61>cimal\tF5",             IDM_VIEW_HEX, CHECKED
-        MENUITEM "D<>cimal\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Octal\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binaire\tF8",                 IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Q-mot\tF12",                  IDM_VIEW_QWORD, CHECKED
-        MENUITEM "D-mot\tF2",                   IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Mot\tF3",                     IDM_VIEW_WORD, CHECKED
-        MENUITEM "Octet\tF4",                   IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grouper les chiffres",        IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Aide"
-    BEGIN
-        MENUITEM "Rubriques d'aide",            IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22> propos de la Calculatrice ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU DISCARDABLE 
-BEGIN
-    POPUP "<22>dition"
-    BEGIN
-        MENUITEM "Copier\tCTRL-C",              IDM_EDIT_COPY
-        MENUITEM "Coller\tCTRL-V",              IDM_EDIT_PASTE
-    END
-    POPUP "Affichage"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifique",                IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Conversion",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Grouper les chiffres",        IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Aide"
-    BEGIN
-        MENUITEM "Rubriques d'aide",            IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22> propos de la Calculatrice ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-// String Tables
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_STRING_LICENSE      "Calculatrice ReactOS est un logiciel libre distribu<62> 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
-
-// types of conversion
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONV_ANGLE          "Angle"
-    IDS_CONV_AREA           "Superficie"
-    IDS_CONV_CONSUMPTION    "Consommation (moteurs)"
-    IDS_CONV_CURRENCY       "Devises"
-    IDS_CONV_ENERGY         "<22>nergie"
-    IDS_CONV_LENGTH         "Longueurs"
-    IDS_CONV_POWER          "Puissance"
-    IDS_CONV_PRESSURE       "Pression"
-    IDS_CONV_TEMPERATURE    "Temp<6D>rature"
-    IDS_CONV_TIME           "Temps"
-    IDS_CONV_VELOCITY       "V<>locit<69>"
-    IDS_CONV_VOLUME         "Volume"
-    IDS_CONV_WEIGHT         "Poids"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Degr<67>s"
-    IDS_ANGLE_GRADIANS      "Grades"
-    IDS_ANGLE_RADIANS       "Radians"
-END
-
-// TYPES OF AREAS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_AREA_ACRES                  "Acres"
-    IDS_AREA_ACRES_BRAZIL           "Acres (Brazil)"
-    IDS_AREA_ACRES_FRANCE           "Acres (France)"
-    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
-    IDS_AREA_ACRES_US               "Acres (US)"
-    IDS_AREA_ARES                   "Ares"
-    IDS_AREA_CHOU                   "Chou"
-    IDS_AREA_DANBO                  "Danbo"
-    IDS_AREA_HECTARES               "Hectares"
-    IDS_AREA_JEONGBO                "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hongrie)"
-    IDS_AREA_MU                     "Mu"
-    IDS_AREA_PING                   "Ping"
-    IDS_AREA_PYEONG                 "Pyeong"
-    IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
-    IDS_AREA_RAI                    "Rai"
-    IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Centim<69>tres carr<72>s"
-    IDS_AREA_SQUARE_CHR             "Chr carr<72>"
-    IDS_AREA_SQUARE_FATHOMS         "Fathoms carr<72>s"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Fathoms carr<72>s (Hongrie)"
-    IDS_AREA_SQUARE_FEET            "Pieds carr<72>s"
-    IDS_AREA_SQUARE_INCHES          "Pouces carr<72>s"
-    IDS_AREA_SQUARE_KILOMETERS      "Kilom<6F>tres carr<72>s"
-    IDS_AREA_SQUARE_LAR             "Square lar"
-    IDS_AREA_SQUARE_METER           "M<>tre carr<72>"
-    IDS_AREA_SQUARE_MILES           "Miles carr<72>s"
-    IDS_AREA_SQUARE_MILLIMETERS     "Millim<69>tres carr<72>s"
-    IDS_AREA_SQUARE_SHAKU           "Shaku carr<72>"
-    IDS_AREA_SQUARE_TSUEN           "Tsuen carr<72>"
-    IDS_AREA_SQUARE_VA              "Va carr<72>"
-    IDS_AREA_SQUARE_YARD            "Yard carr<72>"
-    IDS_AREA_TAN                    "Tan"
-    IDS_AREA_TSUBO                  "Tsubo"
-END
-
-// TYPES OF COMSUMPTIONS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilom<6F>tre/litre"
-    IDS_CONSUMPTION_L_PER_100_KM    "Litres/100 kilom<6F>tres"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
-END
-
-// TYPES OF CURRENCIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Schilling autrichien"
-    IDS_CURRENCY_BELGIAN_FRANC      "Franc belge"
-    IDS_CURRENCY_CYPRIOT_POUND      "Livre chypriote"
-    IDS_CURRENCY_CZECH_KORUNA       "Couronne tch<63>que"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Mark allemand"
-    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
-    IDS_CURRENCY_EURO               "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA     "Marks finlandais"
-    IDS_CURRENCY_FRENCH_FRANC       "Franc fran<61>ais"
-    IDS_CURRENCY_GREEK_DRACHMA      "Drachmes grecques"
-    IDS_CURRENCY_IRISH_POUND        "Livre irlandaise"
-    IDS_CURRENCY_ITALIAN_LIRA       "Lire italienne"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "Franc luxembourgeois"
-    IDS_CURRENCY_MALTESE_LIRA       "Lire maltaise"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Escudo portugaise"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Couronne slovaque"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Tolar slov<6F>ne"
-    IDS_CURRENCY_SPANISH_PESETA     "Peseta espagnole"
-END
-
-// TYPES OF ENERGIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <20>C calories"
-    IDS_ENERGY_BTUS                 "British Thermal Units"
-    IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "<22>lectron-volts"
-    IDS_ENERGY_FOOT_POUNDS          "Pied-livres"
-    IDS_ENERGY_IT_CALORIES          "International Table calories"
-    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
-    IDS_ENERGY_JOULES               "Joules"
-    IDS_ENERGY_KILOJOULES           "Kilojoules"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowattheure"
-    IDS_ENERGY_NUTRITION_CALORIES   "Calories nutritives"
-    IDS_ENERGY_TH_CALORIES          "Calories thermochimiques"
-END
-
-// TYPES OF LENGTHS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angstr<74>m"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Unit<69>s astronomiques"
-    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
-    IDS_LENGTH_CENTIMETERS          "Centim<69>tres"
-    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
-    IDS_LENGTH_CHI                  "Chi"
-    IDS_LENGTH_CHOU                 "Chou"
-    IDS_LENGTH_CHR                  "Chr"
-    IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "Fathoms"
-    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Hungary)"
-    IDS_LENGTH_FEET                 "Pieds"
-    IDS_LENGTH_FURLONGS             "Furlongs"
-    IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "Hands"
-    IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Pouces"
-    IDS_LENGTH_JA                   "Ja"
-    IDS_LENGTH_JEONG                "Jeong"
-    IDS_LENGTH_KABIET               "Kabiet"
-    IDS_LENGTH_KEN                  "Ken"
-    IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "Kilom<6F>tres"
-    IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Ann<6E>es lumi<6D>res"
-    IDS_LENGTH_LINKS_UK             "Links (UK)"
-    IDS_LENGTH_METERS               "M<>tres"
-    IDS_LENGTH_MICRONS              "Microm<6F>tres"
-    IDS_LENGTH_MILES                "Miles"
-    IDS_LENGTH_MILLIMETERS          "Millim<69>tres"
-    IDS_LENGTH_NAUTICAL_MILES       "Miles nautiques"
-    IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parsecs"
-    IDS_LENGTH_PICAS                "Picas"
-    IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
-    IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
-    IDS_LENGTH_SAWK                 "Sawk"
-    IDS_LENGTH_SEN                  "Sen"
-    IDS_LENGTH_SHAKU                "Shaku"
-    IDS_LENGTH_SPAN                 "Span"
-    IDS_LENGTH_SUN                  "Sun"
-    IDS_LENGTH_TSUEN                "Tsuen"
-    IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "Yards"
-    IDS_LENGTH_YOTE                 "Yote"
-    IDS_LENGTH_ZHANG                "Zhang"
-END
-
-// TYPES OF POWERS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units par minute"
-    IDS_POWER_FPS_PER_MINUTE        "Pied-livres par minute"
-    IDS_POWER_HORSEPOWER            "Cheval-vapeur"
-    IDS_POWER_KILOWATTS             "Kilowatts"
-    IDS_POWER_MEGAWATTS             "Megawatts"
-    IDS_POWER_WATTS                 "Watts"
-END
-
-// TYPE OF PRESSURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atmosph<70>res"
-    IDS_PRESSURE_BARS               "Bars"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
-    IDS_PRESSURE_MM_OF_MERCURY      "Millim<69>tres de mercure"
-    IDS_PRESSURE_PASCALS            "Pascals"
-    IDS_PRESSURE_PSI                "Pounds-force per square inch"
-END
-
-// TYPES OF TEMPERATURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS         "Celsius"
-    IDS_TEMPERATURE_FAHRENHEIT      "Fahrenheit"
-    IDS_TEMPERATURE_KELVIN          "Kelvin"
-    IDS_TEMPERATURE_RANKINE         "Rankine"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Jours"
-    IDS_TIME_HOURS        "Heures"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Microsecondes"
-    IDS_TIME_MILLISECONDS "Millisecondes"
-    IDS_TIME_MINUTES      "Minutes"
-    IDS_TIME_SECONDS      "Secondes"
-    IDS_TIME_WEEKS        "Semaines"
-    IDS_TIME_YEARS        "Ann<6E>es"
-END
-
-// TYPES OF VELOCITIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centim<69>tres/seconde"
-    IDS_VELOCITY_FEET_HOUR          "Pieds/heure"
-    IDS_VELOCITY_FEET_SECOND        "Pieds/seconde"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilom<6F>tres/heure"
-    IDS_VELOCITY_KNOTS              "Knots"
-    IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "M<>tres/second"
-    IDS_VELOCITY_MILES_HOUR         "Miles/heure"
-END
-
-// TYPES OF VOLUMES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK           "Baril (UK)"
-    IDS_VOLUME_BARRELS_OIL          "Baril de p<>trole"
-    IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
-    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Centim<69>tres cubes"
-    IDS_VOLUME_CUBIC_FEET           "Pieds cubes"
-    IDS_VOLUME_CUBIC_INCHES         "Pouces cubes"
-    IDS_VOLUME_CUBIC_METERS         "M<>tres cubes"
-    IDS_VOLUME_CUBIC_YARDS          "Yards cubes"
-    IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
-    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "Gallons, sec (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liqude (US)"
-    IDS_VOLUME_GOU                  "Gou"
-    IDS_VOLUME_HOP                  "Hop"
-    IDS_VOLUME_ICCE                 "Icce"
-    IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Litres"
-    IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Millilitres"
-    IDS_VOLUME_PINTS_UK             "Pints (UK)"
-    IDS_VOLUME_PINTS_DRY_US         "Pints, sec (US)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquide (US)"
-    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
-    IDS_VOLUME_QUARTS_DRY_US        "Quarts, sec (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquide (US)"
-    IDS_VOLUME_SEKI                 "Seki"
-    IDS_VOLUME_SYOU                 "Syou"
-    IDS_VOLUME_TANANLOUNG           "Tananloung"
-    IDS_VOLUME_TANG                 "Tang"
-    IDS_VOLUME_TO                   "To"
-END
-
-// TYPES OF WEIGHTS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Carats"
-    IDS_WEIGHT_CHUNG                "Chung"
-    IDS_WEIGHT_DON                  "Don"
-    IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Grammes"
-    IDS_WEIGHT_GWAN                 "Gwan"
-    IDS_WEIGHT_HARB                 "Harb"
-    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
-    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
-    IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilogrammes"
-    IDS_WEIGHT_KIN                  "Kin"
-    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
-    IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
-    IDS_WEIGHT_POUNDS               "Pounds"
-    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
-    IDS_WEIGHT_SALOUNG              "Saloung"
-    IDS_WEIGHT_STONES               "Stones"
-    IDS_WEIGHT_TAMLUNG              "Tamlung"
-    IDS_WEIGHT_TONNES               "Tonnes"
-    IDS_WEIGHT_TONS_UK              "Tons (UK)"
-    IDS_WEIGHT_TONS_US              "Tons (US)"
-END

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

@@ -3,7 +3,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 // Dialog
 
 IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg"
@@ -159,7 +159,7 @@ BEGIN
 END
 
 IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
@@ -226,7 +226,7 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
@@ -304,7 +304,7 @@ BEGIN
 END
 
 IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Informazioni su ReactOS Calc"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -323,7 +323,7 @@ BEGIN
 END
 
 IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Finestra di statistica"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -439,7 +439,6 @@ END
 // Categorie per le conversioni
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "Angoli"
     IDS_CONV_AREA           "Area"
     IDS_CONV_CONSUMPTION    "Consumi (motori)"
     IDS_CONV_CURRENCY       "Valute monetarie"
@@ -448,20 +447,11 @@ BEGIN
     IDS_CONV_POWER          "Potenza"
     IDS_CONV_PRESSURE       "Pressione"
     IDS_CONV_TEMPERATURE    "Temperatura"
-    IDS_CONV_TIME           "Tempo"
     IDS_CONV_VELOCITY       "Velocit<69>"
     IDS_CONV_VOLUME         "Volume"
     IDS_CONV_WEIGHT         "Peso"
 END
 
-// Tipi di angoli
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Sessagesimali"
-    IDS_ANGLE_GRADIANS      "Centesimali (Gradienti)"
-    IDS_ANGLE_RADIANS       "Radianti"
-END
-
 // Tipi di aree
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -516,7 +506,6 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Scellino austriaco"
     IDS_CURRENCY_BELGIAN_FRANC      "Franco belga"
     IDS_CURRENCY_CYPRIOT_POUND      "Sterlina cipriota"
-    IDS_CURRENCY_CZECH_KORUNA       "Corona ceca"
     IDS_CURRENCY_DEUTSCHE_MARK      "Marco tedesco"
     IDS_CURRENCY_DUTCH_GUILDER      "Fiorino olandese"
     IDS_CURRENCY_EURO               "Euro"
@@ -528,7 +517,6 @@ BEGIN
     IDS_CURRENCY_LUXEMBOURG_FRANC   "Franco Lussemburghese"
     IDS_CURRENCY_MALTESE_LIRA       "Lira maltese"
     IDS_CURRENCY_PORTOGUESE_ESCUDO  "Escudo portoghese"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Corona slovacca"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Tallero sloveno"
     IDS_CURRENCY_SPANISH_PESETA     "Peseta spagnola"
 END
@@ -537,12 +525,8 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_ENERGY_15_C_CALORIES        "15 ^C calorie"
-    IDS_ENERGY_BTUS                 "British Thermal Units"
     IDS_ENERGY_ERGS                 "Erg"
-    IDS_ENERGY_EVS                  "Elettron-Volt"
-    IDS_ENERGY_FOOT_POUNDS          "Libbra per piede"
     IDS_ENERGY_IT_CALORIES          "Calorie I.T."
-    IDS_ENERGY_IT_KILOCALORIES      "Kilocalorie I.T."
     IDS_ENERGY_JOULES               "Joule"
     IDS_ENERGY_KILOJOULES           "Kilojoule"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowatt per ora"
@@ -554,7 +538,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LENGTH_ANGSTROMS            "Angstrom"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Unit<69> astronomiche"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Unit<69> astronomiche"
     IDS_LENGTH_BARLEYCORNS          "Barleycorn"
     IDS_LENGTH_CENTIMETERS          "Centimetri"
     IDS_LENGTH_CHAINS_UK            "Catene (GB)"
@@ -580,7 +564,6 @@ BEGIN
     IDS_LENGTH_LIGHT_YEARS          "Anni luce"
     IDS_LENGTH_LINKS_UK             "Links (GB)"
     IDS_LENGTH_METERS               "Metri"
-    IDS_LENGTH_MICRONS              "Micrometro"
     IDS_LENGTH_MILES                "Miglia"
     IDS_LENGTH_MILLIMETERS          "Millimetri"
     IDS_LENGTH_NAUTICAL_MILES       "Miglia nautiche"
@@ -589,7 +572,6 @@ BEGIN
     IDS_LENGTH_PICAS                "Pica"
     IDS_LENGTH_RI_JAPAN             "Ri (Giappone)"
     IDS_LENGTH_RI_KOREA             "Ri (Corea)"
-    IDS_LENGTH_RODS                 "Rod"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -605,8 +587,6 @@ END
 // Tipi di potenze
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "BTU al minuto"
-    IDS_POWER_FPS_PER_MINUTE        "Libbra per piede al minuto"
     IDS_POWER_HORSEPOWER            "Cavalli vapore"
     IDS_POWER_KILOWATTS             "Kilowatt"
     IDS_POWER_MEGAWATTS             "Megawatt"
@@ -618,8 +598,6 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosfere"
     IDS_PRESSURE_BARS               "Bar"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascal"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascal"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimetri di mercurio"
     IDS_PRESSURE_PASCALS            "Pascal"
     IDS_PRESSURE_PSI                "Libbre-forza per pollice quadrato"
@@ -634,26 +612,10 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
-// Tipi di tempi
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Giorni"
-    IDS_TIME_HOURS        "Ore"
-    IDS_TIME_NANOSECONDS  "Nanosecondi"
-    IDS_TIME_MICROSECONDS "Microsecondi"
-    IDS_TIME_MILLISECONDS "Millisecondi"
-    IDS_TIME_MINUTES      "Minuti"
-    IDS_TIME_SECONDS      "Secondi"
-    IDS_TIME_WEEKS        "Settimane"
-    IDS_TIME_YEARS        "Anni"
-END
-
 // Tipi di velocit<69>
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimetri/ora"
     IDS_VELOCITY_FEET_HOUR          "Piedi/ora"
-    IDS_VELOCITY_FEET_SECOND        "Piedi/secondo"
     IDS_VELOCITY_KILOMETERS_HOUR    "Chilometri/ora"
     IDS_VELOCITY_KNOTS              "Nodi"
     IDS_VELOCITY_MACH               "Mach"
@@ -714,8 +676,8 @@ BEGIN
     IDS_WEIGHT_JIN_CHINA            "Jin (Cina)"
     IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
     IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Chilogrammi"
     IDS_WEIGHT_KIN                  "Kin"
+    IDS_WEIGHT_KILOGRAMS            "Chilogrammi"
     IDS_WEIGHT_LIANG_CHINA          "Liang (Cina)"
     IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
     IDS_WEIGHT_MONME                "Monme"

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

@@ -1,9 +1,7 @@
 /*
- *  Korean translation by manatails007 (www.manatails007.org) Seungju Kim
+ *Korean translation by manatails007(www.manatails007.org) Seungju Kim
  */
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-
 // Dialog
 
 IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
@@ -13,10 +11,14 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -149,7 +151,7 @@ BEGIN
                     42,10
     CONTROL         "Radians",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192,
                     24,42,10
-    CONTROL         "Gradians",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
+    CONTROL         "Grads",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
                     236,24,44,10
     PUSHBUTTON      "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | 
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
@@ -229,91 +231,13 @@ BEGIN
     DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON      "Convert",IDC_BUTTON_CONVERT,35,105,76,17
-    COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Category:",IDC_STATIC,4,20,56,8
-    COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Convert from:",IDC_STATIC,4,49,56,8
-    COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP | CBS_SORT
-    LTEXT           "Convert to:",IDC_STATIC,4,76,56,8
-    CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
-    CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
-                    BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
-                    40,17
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17
-    CONTROL         "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17
-    CONTROL         "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17
-    CONTROL         "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17
-    CONTROL         "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17
-    CONTROL         "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17
-    CONTROL         "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17
-    CONTROL         "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17
-    CONTROL         "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17
-    CONTROL         "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17
-    CONTROL         "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17
-    CONTROL         ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17
-    CONTROL         "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17
-    CONTROL         "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17
-    CONTROL         "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17
-    CONTROL         "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17
-    CONTROL         "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17
-    CONTROL         "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17
-    CONTROL         "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17
-    CONTROL         "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17
-    CTEXT           "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17
-    CONTROL         "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17
-    CONTROL         "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17
-    CONTROL         "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE
-END
-
 IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  0, 0, 264, 169
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,105,148,52,16
-    CONTROL         IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
+    CONTROL         106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48
     LTEXT           "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,120,12,132,8,
                     SS_CENTERIMAGE
@@ -341,6 +265,7 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -348,13 +273,13 @@ BEGIN
     POPUP "<22><><EFBFBD><EFBFBD>"
     BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "<22>ٿ<EFBFBD><D9BF>ֱ<EFBFBD>\tCTRL-V",            IDM_EDIT_PASTE
+        MENUITEM "<22>ٿ<EFBFBD><D9BF>ֱ<EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "<22><><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22>Ϲ<EFBFBD>",                        IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD>",                        IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><>ȯ",                        IDM_VIEW_CONVERSION
+        MENUITEM "<22>Ϲ<EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "<22><>ȯ",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
         MENUITEM "Decimal\tF6",                 IDM_VIEW_DEC, CHECKED
@@ -365,13 +290,13 @@ BEGIN
         MENUITEM "Radians\tF3",                 IDM_VIEW_RAD, CHECKED
         MENUITEM "Grads\tF4",                   IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "<22>ڸ<EFBFBD><DAB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",            IDM_VIEW_GROUP, CHECKED
+        MENUITEM "<22>ڸ<EFBFBD><DAB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>׸<EFBFBD>",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",         IDM_HELP_ABOUT
+        MENUITEM "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",          IDM_HELP_ABOUT
     END
 END
 
@@ -380,13 +305,13 @@ BEGIN
     POPUP "<22><><EFBFBD><EFBFBD>"
     BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "<22>ٿ<EFBFBD><D9BF>ֱ<EFBFBD>\tCTRL-V",            IDM_EDIT_PASTE
+        MENUITEM "<22>ٿ<EFBFBD><D9BF>ֱ<EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "<22><><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22>Ϲ<EFBFBD>",                        IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD>",                        IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><>ȯ",                        IDM_VIEW_CONVERSION
+        MENUITEM "<22>Ϲ<EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "<22><>ȯ",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
         MENUITEM "Decimal\tF6",                 IDM_VIEW_DEC, CHECKED
@@ -398,13 +323,13 @@ BEGIN
         MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
         MENUITEM "Byte\tF4",                    IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "<22>ڸ<EFBFBD><DAB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",            IDM_VIEW_GROUP, CHECKED
+        MENUITEM "<22>ڸ<EFBFBD><DAB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>׸<EFBFBD>",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",         IDM_HELP_ABOUT
+        MENUITEM "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",          IDM_HELP_ABOUT
     END
 END
 
@@ -413,21 +338,21 @@ BEGIN
     POPUP "<22><><EFBFBD><EFBFBD>"
     BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD>\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "<22>ٿ<EFBFBD><D9BF>ֱ<EFBFBD>\tCTRL-V",            IDM_EDIT_PASTE
+        MENUITEM "<22>ٿ<EFBFBD><D9BF>ֱ<EFBFBD>\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "<22><><EFBFBD><EFBFBD>"
     BEGIN
-        MENUITEM "<22>Ϲ<EFBFBD>",                        IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD>",                        IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><>ȯ",                        IDM_VIEW_CONVERSION
+        MENUITEM "<22>Ϲ<EFBFBD>",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "<22><><EFBFBD><EFBFBD>",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "<22><>ȯ",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "<22>ڸ<EFBFBD><DAB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",            IDM_VIEW_GROUP, CHECKED
+        MENUITEM "<22>ڸ<EFBFBD><DAB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>׸<EFBFBD>",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",         IDM_HELP_ABOUT
+        MENUITEM "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",          IDM_HELP_ABOUT
     END
 END
 
@@ -440,297 +365,3 @@ BEGIN
     IDS_QUICKHELP           "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 END
 
-// Types of conversion
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONV_ANGLE          "<22><><EFBFBD><EFBFBD>"
-    IDS_CONV_AREA           "Area"
-    IDS_CONV_CONSUMPTION    "Consumption (engines)"
-    IDS_CONV_CURRENCY       "Currencies"
-    IDS_CONV_ENERGY         "Energy"
-    IDS_CONV_LENGTH         "Lenghts"
-    IDS_CONV_POWER          "Power"
-    IDS_CONV_PRESSURE       "Pressure"
-    IDS_CONV_TEMPERATURE    "Temperature"
-    IDS_CONV_TIME           "<22><><EFBFBD><EFBFBD>"
-    IDS_CONV_VELOCITY       "Velocity"
-    IDS_CONV_VOLUME         "Volume"
-    IDS_CONV_WEIGHT         "Weights"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Degrees"
-    IDS_ANGLE_GRADIANS      "Gradians"
-    IDS_ANGLE_RADIANS       "Radians"
-END
-
-// TYPES OF AREAS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_AREA_ACRES                  "Acres"
-    IDS_AREA_ACRES_BRAZIL           "Acres (Brazil)"
-    IDS_AREA_ACRES_FRANCE           "Acres (France)"
-    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
-    IDS_AREA_ACRES_US               "Acres (US)"
-    IDS_AREA_ARES                   "Ares"
-    IDS_AREA_CHOU                   "Chou"
-    IDS_AREA_DANBO                  "Danbo"
-    IDS_AREA_HECTARES               "Hectares"
-    IDS_AREA_JEONGBO                "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungary)"
-    IDS_AREA_MU                     "Mu"
-    IDS_AREA_PING                   "Ping"
-    IDS_AREA_PYEONG                 "Pyeong"
-    IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
-    IDS_AREA_RAI                    "Rai"
-    IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Square centimeters"
-    IDS_AREA_SQUARE_CHR             "Square chr"
-    IDS_AREA_SQUARE_FATHOMS         "Square fathoms"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
-    IDS_AREA_SQUARE_FEET            "Square feet"
-    IDS_AREA_SQUARE_INCHES          "Square inches"
-    IDS_AREA_SQUARE_KILOMETERS      "Square kilometers"
-    IDS_AREA_SQUARE_LAR             "Square lar"
-    IDS_AREA_SQUARE_METER           "Square meter"
-    IDS_AREA_SQUARE_MILES           "Square miles"
-    IDS_AREA_SQUARE_MILLIMETERS     "Square millimeters"
-    IDS_AREA_SQUARE_SHAKU           "Square shaku"
-    IDS_AREA_SQUARE_TSUEN           "Square tsuen"
-    IDS_AREA_SQUARE_VA              "Square va"
-    IDS_AREA_SQUARE_YARD            "Square yard"
-    IDS_AREA_TAN                    "Tan"
-    IDS_AREA_TSUBO                  "Tsubo"
-END
-
-// TYPES OF COMSUMPTIONS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
-    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometers"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
-END
-
-// TYPES OF CURRENCIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
-    IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
-    IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
-    IDS_CURRENCY_CZECH_KORUNA       "Czech Koruna"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
-    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
-    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_LUXEMBOURG_FRANC   "Luxembourg franc"
-    IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slovak koruna"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
-    IDS_CURRENCY_SPANISH_PESETA     "Spanish peseta"
-END
-
-// TYPES OF ENERGIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <20><>C calories"
-    IDS_ENERGY_BTUS                 "British Thermal Units"
-    IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "<22><><EFBFBD>ں<EFBFBD>Ʈ"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
-    IDS_ENERGY_IT_CALORIES          "International Table calories"
-    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
-    IDS_ENERGY_JOULES               "Joules"
-    IDS_ENERGY_KILOJOULES           "Kilojoules"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
-    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calories"
-    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie"
-END
-
-// TYPES OF LENGTHS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS            "<22>˽<EFBFBD>Ʈ<EFBFBD><C6AE>"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
-    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
-    IDS_LENGTH_CENTIMETERS          "Centimeters"
-    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
-    IDS_LENGTH_CHI                  "Chi"
-    IDS_LENGTH_CHOU                 "Chou"
-    IDS_LENGTH_CHR                  "Chr"
-    IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "Fathoms"
-    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Hungary)"
-    IDS_LENGTH_FEET                 "Feet"
-    IDS_LENGTH_FURLONGS             "Furlongs"
-    IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "Hands"
-    IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Inches"
-    IDS_LENGTH_JA                   "Ja"
-    IDS_LENGTH_JEONG                "Jeong"
-    IDS_LENGTH_KABIET               "Kabiet"
-    IDS_LENGTH_KEN                  "Ken"
-    IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "Kilometers"
-    IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Light years"
-    IDS_LENGTH_LINKS_UK             "Links (UK)"
-    IDS_LENGTH_METERS               "Meters"
-    IDS_LENGTH_MICRONS              "Microns"
-    IDS_LENGTH_MILES                "Miles"
-    IDS_LENGTH_MILLIMETERS          "Millimeters"
-    IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
-    IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parsecs"
-    IDS_LENGTH_PICAS                "Picas"
-    IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
-    IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
-    IDS_LENGTH_SAWK                 "Sawk"
-    IDS_LENGTH_SEN                  "Sen"
-    IDS_LENGTH_SHAKU                "Shaku"
-    IDS_LENGTH_SPAN                 "Span"
-    IDS_LENGTH_SUN                  "Sun"
-    IDS_LENGTH_TSUEN                "Tsuen"
-    IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "Yards"
-    IDS_LENGTH_YOTE                 "Yote"
-    IDS_LENGTH_ZHANG                "Zhang"
-END
-
-// TYPES OF POWERS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
-    IDS_POWER_HORSEPOWER            "Horsepower"
-    IDS_POWER_KILOWATTS             "Kilowatts"
-    IDS_POWER_MEGAWATTS             "Megawatts"
-    IDS_POWER_WATTS                 "Watts"
-END
-
-// TYPE OF PRESSURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
-    IDS_PRESSURE_BARS               "Bars"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
-    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
-    IDS_PRESSURE_PASCALS            "Pascals"
-    IDS_PRESSURE_PSI                "Pounds-force per square inch"
-END
-
-// TYPES OF TEMPERATURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS         "Celsius"
-    IDS_TEMPERATURE_FAHRENHEIT      "Fahrenheit"
-    IDS_TEMPERATURE_KELVIN          "Kelvin"
-    IDS_TEMPERATURE_RANKINE         "Rankine"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Days"
-    IDS_TIME_HOURS        "Hours"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Microseconds"
-    IDS_TIME_MILLISECONDS "Milliseconds"
-    IDS_TIME_MINUTES      "Minutes"
-    IDS_TIME_SECONDS      "Seconds"
-    IDS_TIME_WEEKS        "Weeks"
-    IDS_TIME_YEARS        "Years"
-END
-
-// TYPES OF VELOCITIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimeters/hour"
-    IDS_VELOCITY_FEET_HOUR          "Feet/hour"
-    IDS_VELOCITY_FEET_SECOND        "Feet/second"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
-    IDS_VELOCITY_KNOTS              "Knots"
-    IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "Meters/second"
-    IDS_VELOCITY_MILES_HOUR         "Miles/hour"
-END
-
-// TYPES OF VOLUMES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK           "Barrels (UK)"
-    IDS_VOLUME_BARRELS_OIL          "Barrels oil"
-    IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
-    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Cubic centimeters"
-    IDS_VOLUME_CUBIC_FEET           "Cubic feet"
-    IDS_VOLUME_CUBIC_INCHES         "Cubic inches"
-    IDS_VOLUME_CUBIC_METERS         "Cubic meters"
-    IDS_VOLUME_CUBIC_YARDS          "Cubic yards"
-    IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
-    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "Gallons, dry (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liquid (US)"
-    IDS_VOLUME_GOU                  "Gou"
-    IDS_VOLUME_HOP                  "Hop"
-    IDS_VOLUME_ICCE                 "Icce"
-    IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Liters"
-    IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Milliliters"
-    IDS_VOLUME_PINTS_UK             "Pints (UK)"
-    IDS_VOLUME_PINTS_DRY_US         "Pints, dry (US)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquid (US)"
-    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
-    IDS_VOLUME_QUARTS_DRY_US        "Quarts, dry (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquid (US)"
-    IDS_VOLUME_SEKI                 "Seki"
-    IDS_VOLUME_SYOU                 "Syou"
-    IDS_VOLUME_TANANLOUNG           "Tananloung"
-    IDS_VOLUME_TANG                 "Tang"
-    IDS_VOLUME_TO                   "To"
-END
-
-// TYPES OF WEIGHTS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Carats"
-    IDS_WEIGHT_CHUNG                "Chung"
-    IDS_WEIGHT_DON                  "Don"
-    IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Grams"
-    IDS_WEIGHT_GWAN                 "Gwan"
-    IDS_WEIGHT_HARB                 "Harb"
-    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
-    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
-    IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilograms"
-    IDS_WEIGHT_KIN                  "Kin"
-    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
-    IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
-    IDS_WEIGHT_POUNDS               "Pounds"
-    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
-    IDS_WEIGHT_SALOUNG              "Saloung"
-    IDS_WEIGHT_STONES               "Stones"
-    IDS_WEIGHT_TAMLUNG              "Tamlung"
-    IDS_WEIGHT_TONNES               "Tonnes"
-    IDS_WEIGHT_TONS_UK              "Tons (UK)"
-    IDS_WEIGHT_TONS_US              "Tons (US)"
-END

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

@@ -0,0 +1,365 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+// Dialog
+
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
+STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Kalkulator"
+MENU IDR_MENU_SCIENTIFIC_1
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    GROUPBOX        "",IDC_STATIC,4,16,132,21
+    CONTROL         "Heks",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Des",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
+    GROUPBOX        "",IDC_STATIC,4,36,76,21
+    CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,8,44,26,10
+    CONTROL         "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,40,44,29,10
+    CTEXT           "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE,
+                    WS_EX_CLIENTEDGE
+    CTEXT           "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE,
+                    WS_EX_CLIENTEDGE
+    PUSHBUTTON      "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    GROUPBOX        "",IDC_STATIC,140,16,172,21
+    CONTROL         "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | 
+                    NOT WS_VISIBLE,148,24,37,10
+    CONTROL         "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | 
+                    NOT WS_VISIBLE,188,24,37,10
+    CONTROL         "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT 
+                    WS_VISIBLE,232,24,33,10
+    CONTROL         "Tegn",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT 
+                    WS_VISIBLE,272,24,30,10
+    CONTROL         "Grader",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24,
+                    42,10
+    CONTROL         "Radianer",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192,
+                    24,42,10
+    CONTROL         "Gradienter",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
+                    236,24,44,10
+    PUSHBUTTON      "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Tilbake",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    RTEXT           "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE,
+                    WS_EX_CLIENTEDGE
+    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
+END
+
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
+STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Kalkulator"
+MENU IDR_MENU_STANDARD
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    PUSHBUTTON      "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Tibake",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    RTEXT           "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE,
+                    WS_EX_CLIENTEDGE
+    PUSHBUTTON      "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | 
+                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    CTEXT           "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE,
+                    WS_EX_CLIENTEDGE
+    PUSHBUTTON      "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    PUSHBUTTON      "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | 
+                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
+    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
+END
+
+IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  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         106,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,4,56,256,88
+    EDITTEXT        IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | 
+                    WS_VSCROLL
+END
+
+IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
+STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "statistikk boks"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
+                    WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "RET",IDC_BUTTON_RET,4,48,36,16
+    PUSHBUTTON      "LOAD",IDC_BUTTON_LOAD,44,48,36,16
+    PUSHBUTTON      "CD",IDC_BUTTON_CD,84,48,36,16
+    PUSHBUTTON      "CAD",IDC_BUTTON_CAD,124,48,36,16
+    CTEXT           "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | 
+                    SS_SUNKEN
+END
+
+
+// Menus
+
+IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
+BEGIN
+    POPUP "Rediger"
+    BEGIN
+        MENUITEM "Kopier\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V",               IDM_EDIT_PASTE
+    END
+    POPUP "Vis"
+    BEGIN
+        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vitenskapelig",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Konvertering",                  IDM_VIEW_CONVERSION
+        MENUITEM SEPARATOR
+        MENUITEM "Heksadesimalt\tF5",                     IDM_VIEW_HEX, CHECKED
+        MENUITEM "Desimalt\tF6",                 IDM_VIEW_DEC, CHECKED
+        MENUITEM "Oktalt\tF7",                   IDM_VIEW_OCT, CHECKED
+        MENUITEM "Bin<69>rt\tF8",                  IDM_VIEW_BIN, CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "Grader\tF2",                 IDM_VIEW_DEG, CHECKED
+        MENUITEM "Radianer\tF3",                 IDM_VIEW_RAD, CHECKED
+        MENUITEM "Gradienter\tF4",                   IDM_VIEW_GRAD, CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "Siffergruppering",                IDM_VIEW_GROUP, CHECKED
+    END
+    POPUP "Hjelp"
+    BEGIN
+        MENUITEM "Emner i hjelp",                 IDM_HELP_HELP
+        MENUITEM SEPARATOR
+        MENUITEM "Om ReactOS kalkulator",          IDM_HELP_ABOUT
+    END
+END
+
+IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE 
+BEGIN
+    POPUP "Rediger"
+    BEGIN
+        MENUITEM "Kopier\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V",               IDM_EDIT_PASTE
+    END
+    POPUP "Vis"
+    BEGIN
+        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vitenskapelig",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "konvertering",                  IDM_VIEW_CONVERSION
+        MENUITEM SEPARATOR
+        MENUITEM "Heksadesimalt\tF5",                     IDM_VIEW_HEX, CHECKED
+        MENUITEM "Desimal\tF6",                 IDM_VIEW_DEC, CHECKED
+        MENUITEM "Oktalt\tF7",                   IDM_VIEW_OCT, CHECKED
+        MENUITEM "Bin<69>rt\tF8",                  IDM_VIEW_BIN, CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
+        MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
+        MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
+        MENUITEM "Tegn\tF4",                    IDM_VIEW_BYTE, CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "Group digits",                IDM_VIEW_GROUP, CHECKED
+    END
+    POPUP "Hjelp"
+    BEGIN
+        MENUITEM "Emner i hjelp",                 IDM_HELP_HELP
+        MENUITEM SEPARATOR
+        MENUITEM "Om ReactOS Kalkulator",          IDM_HELP_ABOUT
+    END
+END
+
+IDR_MENU_STANDARD MENU DISCARDABLE 
+BEGIN
+    POPUP "Rediger"
+    BEGIN
+        MENUITEM "Kopier\tCTRL-C",                IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V",               IDM_EDIT_PASTE
+    END
+    POPUP "Vis"
+    BEGIN
+        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vitenskapelig",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "konvertering",                  IDM_VIEW_CONVERSION
+        MENUITEM SEPARATOR
+        MENUITEM "Siffergruppering",                IDM_VIEW_GROUP, CHECKED
+    END
+    POPUP "Hjelp"
+    BEGIN
+        MENUITEM "Emner i hjelp",                 IDM_HELP_HELP
+        MENUITEM SEPARATOR
+        MENUITEM "Om Reactos Kalkulator",          IDM_HELP_ABOUT
+    END
+END
+
+// String Tables
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_STRING_LICENSE      "ReactOS kalkulator er gratis pogramvare utgitt under GNU GPL lisensen.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan ogs<67> f<> en oversettelse av GNU GPL lisensen here:\r\nhttp://www.gnu.org/licenses/translations.html"
+    IDS_MATH_ERROR          "Feil"
+    IDS_QUICKHELP           "Rask hjelp"
+END
+

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

@@ -1,3 +1,4 @@
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 // Dialog
@@ -9,10 +10,14 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -151,7 +156,7 @@ BEGIN
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON      "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | 
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Terug",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
+    PUSHBUTTON      "BACKSPACE",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     RTEXT           "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE,
                     WS_EX_CLIENTEDGE
@@ -226,26 +231,26 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Rekenmachine"
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    PUSHBUTTON      "Converteren",IDC_BUTTON_CONVERT,35,105,76,17
+    PUSHBUTTON      "Convert",IDC_BUTTON_CONVERT,35,105,76,17
     COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Categorie:",IDC_STATIC,4,20,56,8
+    LTEXT           "Category:",IDC_STATIC,4,20,56,8
     COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Converteren van:",IDC_STATIC,4,49,66,8
+    LTEXT           "Convert from:",IDC_STATIC,4,49,56,8
     COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP | CBS_SORT
-    LTEXT           "Converteren naar:",IDC_STATIC,4,76,66,8
+    LTEXT           "Convert to:",IDC_STATIC,4,76,56,8
     CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
     CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "Terug",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
+    CONTROL         "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
                     BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
                     40,17
     RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
@@ -337,6 +342,7 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -367,7 +373,7 @@ BEGIN
     BEGIN
         MENUITEM "Help-onderwerpen",            IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Over ReactOS Calc",           IDM_HELP_ABOUT
+        MENUITEM "Info",                        IDM_HELP_ABOUT
     END
 END
 
@@ -382,7 +388,7 @@ BEGIN
     BEGIN
         MENUITEM "Standaard",                   IDM_VIEW_STANDARD, CHECKED
         MENUITEM "Wetenschappelijk",            IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Converteren",                 IDM_VIEW_CONVERSION
+        MENUITEM "Omzetten",                    IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
         MENUITEM "Decimaal\tF6",                IDM_VIEW_DEC, CHECKED
@@ -398,9 +404,9 @@ BEGIN
     END
     POPUP "Help"
     BEGIN
-        MENUITEM "Help-onderwerpen",            IDM_HELP_HELP
+        MENUITEM "Help-onderpwerpen",           IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Over ReactOS Calc",           IDM_HELP_ABOUT
+        MENUITEM "Info",                        IDM_HELP_ABOUT
     END
 END
 
@@ -415,7 +421,7 @@ BEGIN
     BEGIN
         MENUITEM "Standaard",                   IDM_VIEW_STANDARD, CHECKED
         MENUITEM "Wetenschappelijk",            IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Converteren",                 IDM_VIEW_CONVERSION
+        MENUITEM "Omzetten",                    IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Cijfergroeperingen",          IDM_VIEW_GROUP, CHECKED
     END
@@ -423,7 +429,7 @@ BEGIN
     BEGIN
         MENUITEM "Help-onderwerpen",            IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Over ReactOS Calc",           IDM_HELP_ABOUT
+        MENUITEM "Info",                        IDM_HELP_ABOUT
     END
 END
 
@@ -431,35 +437,25 @@ END
 
 STRINGTABLE DISCARDABLE 
 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_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 vier bezichtigen:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR          "Fout"
     IDS_QUICKHELP           "Snelle hulp"
 END
 
-// Types of conversion
+// types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "Hoek"
-    IDS_CONV_AREA           "Oppervlakte"
-    IDS_CONV_CONSUMPTION    "Verbruik (motoren)"
-    IDS_CONV_CURRENCY       "Valuta"
-    IDS_CONV_ENERGY         "Energie"
-    IDS_CONV_LENGTH         "Lengte"
-    IDS_CONV_POWER          "Vermogen"
-    IDS_CONV_PRESSURE       "Druk"
-    IDS_CONV_TEMPERATURE    "Temperatuur"
-    IDS_CONV_TIME           "Tijd"
-    IDS_CONV_VELOCITY       "Snelheid"
+    IDS_CONV_AREA           "Area"
+    IDS_CONV_CONSUMPTION    "Consumption (engines)"
+    IDS_CONV_CURRENCY       "Currencies"
+    IDS_CONV_ENERGY         "Energy"
+    IDS_CONV_LENGTH         "Lenghts"
+    IDS_CONV_POWER          "Power"
+    IDS_CONV_PRESSURE       "Pressure"
+    IDS_CONV_TEMPERATURE    "Temperature"
+    IDS_CONV_VELOCITY       "Velocity"
     IDS_CONV_VOLUME         "Volume"
-    IDS_CONV_WEIGHT         "Gewicht"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Graden"
-    IDS_ANGLE_GRADIANS      "Gradi<64>nten"
-    IDS_ANGLE_RADIANS       "Radialen"
+    IDS_CONV_WEIGHT         "Weights"
 END
 
 // TYPES OF AREAS
@@ -482,21 +478,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Vierkante centimeters"
-    IDS_AREA_SQUARE_CHR             "Vierkante chr"
-    IDS_AREA_SQUARE_FATHOMS         "Vierkante fathoms"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Vierkante fathoms (Hungary)"
-    IDS_AREA_SQUARE_FEET            "Vierkante feet"
-    IDS_AREA_SQUARE_INCHES          "Vierkante inches"
-    IDS_AREA_SQUARE_KILOMETERS      "Vierkante kilometers"
-    IDS_AREA_SQUARE_LAR             "Vierkante lar"
-    IDS_AREA_SQUARE_METER           "Vierkante meter"
-    IDS_AREA_SQUARE_MILES           "Vierkante miles"
-    IDS_AREA_SQUARE_MILLIMETERS     "Vierkante millimeters"
-    IDS_AREA_SQUARE_SHAKU           "Vierkante shaku"
-    IDS_AREA_SQUARE_TSUEN           "Vierkante tsuen"
-    IDS_AREA_SQUARE_VA              "Vierkante va"
-    IDS_AREA_SQUARE_YARD            "Vierkante yard"
+    IDS_AREA_SQUARE_CENTIMETERS     "Square centimeters"
+    IDS_AREA_SQUARE_CHR             "Square chr"
+    IDS_AREA_SQUARE_FATHOMS         "Square fathoms"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
+    IDS_AREA_SQUARE_FEET            "Square feet"
+    IDS_AREA_SQUARE_INCHES          "Square inches"
+    IDS_AREA_SQUARE_KILOMETERS      "Square kilometers"
+    IDS_AREA_SQUARE_LAR             "Square lar"
+    IDS_AREA_SQUARE_METER           "Square meter"
+    IDS_AREA_SQUARE_MILES           "Square miles"
+    IDS_AREA_SQUARE_MILLIMETERS     "Square millimeters"
+    IDS_AREA_SQUARE_SHAKU           "Square shaku"
+    IDS_AREA_SQUARE_TSUEN           "Square tsuen"
+    IDS_AREA_SQUARE_VA              "Square va"
+    IDS_AREA_SQUARE_YARD            "Square yard"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -504,8 +500,8 @@ END
 // TYPES OF COMSUMPTIONS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometers/liter"
-    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometer"
+    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
+    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometers"
     IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
     IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
 END
@@ -513,48 +509,42 @@ END
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Oostenrijkse schilling"
-    IDS_CURRENCY_BELGIAN_FRANC      "Belgische franc"
-    IDS_CURRENCY_CYPRIOT_POUND      "Cypriotische pound"
-    IDS_CURRENCY_CZECH_KORUNA       "Tsjechische kroon"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Duitse Mark"
-    IDS_CURRENCY_DUTCH_GUILDER      "Nederlandse gulden"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
+    IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
+    IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
+    IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
+    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
     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_LUXEMBOURG_FRANC   "Luxemburgse franc"
+    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_LUXEMBOURG_FRANC   "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portugese escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slowaakse kroon"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Sloveense tolar"
-    IDS_CURRENCY_SPANISH_PESETA     "Spaanse peseta"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
+    IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
+    IDS_CURRENCY_SPANISH_PESETA     "Spanish peseta"
 END
 
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <EFBFBD>C calorie<EFBFBD>n"
-    IDS_ENERGY_BTUS                 "British thermal units"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
     IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Elektronvolts"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
-    IDS_ENERGY_IT_CALORIES          "International Table calorie<69>n"
-    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalorie<69>n"
+    IDS_ENERGY_IT_CALORIES          "International Table calories"
     IDS_ENERGY_JOULES               "Joules"
     IDS_ENERGY_KILOJOULES           "Kilojoules"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt uur"
-    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calorie<EFBFBD>n"
-    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie<EFBFBD>n"
+    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
+    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calories"
+    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie"
 END
 
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LENGTH_ANGSTROMS            "Angstroms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomila units"
     IDS_LENGTH_BARLEYCORNS          "Barleycorns"
     IDS_LENGTH_CENTIMETERS          "Centimeters"
     IDS_LENGTH_CHAINS_UK            "Chains (UK)"
@@ -577,10 +567,9 @@ BEGIN
     IDS_LENGTH_KEUB                 "Keub"
     IDS_LENGTH_KILOMETERS           "Kilometers"
     IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Lichtjaren"
+    IDS_LENGTH_LIGHT_YEARS          "Light years"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Meters"
-    IDS_LENGTH_MICRONS              "Micrometers"
     IDS_LENGTH_MILES                "Miles"
     IDS_LENGTH_MILLIMETERS          "Millimeters"
     IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
@@ -589,7 +578,6 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -605,8 +593,6 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minuut"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minuut"
     IDS_POWER_HORSEPOWER            "Horsepower"
     IDS_POWER_KILOWATTS             "Kilowatts"
     IDS_POWER_MEGAWATTS             "Megawatts"
@@ -616,13 +602,11 @@ END
 // TYPE OF PRESSURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atmosfeer"
+    IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
     IDS_PRESSURE_BARS               "Bars"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
-    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters kwik"
+    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
     IDS_PRESSURE_PASCALS            "Pascals"
-    IDS_PRESSURE_PSI                "Pounds-force per vierkante inch"
+    IDS_PRESSURE_PSI                "Pounds-force per square inch"
 END
 
 // TYPES OF TEMPERATURES
@@ -634,31 +618,15 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Dagen"
-    IDS_TIME_HOURS        "Uren"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Microseconden"
-    IDS_TIME_MILLISECONDS "Milliseconden"
-    IDS_TIME_MINUTES      "Minuten"
-    IDS_TIME_SECONDS      "Seconden"
-    IDS_TIME_WEEKS        "Weken"
-    IDS_TIME_YEARS        "Jaren"
-END
-
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimeters/uur"
-    IDS_VELOCITY_FEET_HOUR          "Feet/uur"
-    IDS_VELOCITY_FEET_SECOND        "Feet/seconde"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/uur"
+    IDS_VELOCITY_FEET_HOUR          "Feet/hour"
+    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
     IDS_VELOCITY_KNOTS              "Knots"
     IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "Meters/seconde"
-    IDS_VELOCITY_MILES_HOUR         "Miles/uur"
+    IDS_VELOCITY_METERS_SECOND      "Meters/second"
+    IDS_VELOCITY_MILES_HOUR         "Miles/hour"
 END
 
 // TYPES OF VOLUMES
@@ -669,11 +637,11 @@ BEGIN
     IDS_VOLUME_BUN                  "Bun"
     IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
     IDS_VOLUME_BUSHELS_US           "Bushels (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Kubieke centimeters"
-    IDS_VOLUME_CUBIC_FEET           "Kubieke feet"
-    IDS_VOLUME_CUBIC_INCHES         "Kubieke inches"
-    IDS_VOLUME_CUBIC_METERS         "Kubieke meters"
-    IDS_VOLUME_CUBIC_YARDS          "Kubieke yards"
+    IDS_VOLUME_CUBIC_CENTIMETERS    "Cubic centimeters"
+    IDS_VOLUME_CUBIC_FEET           "Cubic feet"
+    IDS_VOLUME_CUBIC_INCHES         "Cubic inches"
+    IDS_VOLUME_CUBIC_METERS         "Cubic meters"
+    IDS_VOLUME_CUBIC_YARDS          "Cubic yards"
     IDS_VOLUME_DOE                  "Doe"
     IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
     IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
@@ -704,17 +672,17 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Karaat"
+    IDS_WEIGHT_CARATS               "Carats"
     IDS_WEIGHT_CHUNG                "Chung"
     IDS_WEIGHT_DON                  "Don"
     IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Grammen"
+    IDS_WEIGHT_GRAMS                "Grams"
     IDS_WEIGHT_GWAN                 "Gwan"
     IDS_WEIGHT_HARB                 "Harb"
     IDS_WEIGHT_JIN_CHINA            "Jin (China)"
     IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
     IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilogrammen"
+    IDS_WEIGHT_KILOGRAMS            "Kilograms"
     IDS_WEIGHT_KIN                  "Kin"
     IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
     IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"

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

@@ -1,732 +0,0 @@
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-
-// Dialog
-
-IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkulator"
-MENU IDR_MENU_SCIENTIFIC_1
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Heks",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Des",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
-    GROUPBOX        "",IDC_STATIC,4,36,76,21
-    CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,8,44,26,10
-    CONTROL         "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,40,44,29,10
-    CTEXT           "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CTEXT           "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    GROUPBOX        "",IDC_STATIC,140,16,172,21
-    CONTROL         "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,148,24,37,10
-    CONTROL         "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,188,24,37,10
-    CONTROL         "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,232,24,33,10
-    CONTROL         "Tegn",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,272,24,30,10
-    CONTROL         "Grader",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24,
-                    42,10
-    CONTROL         "Radianer",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192,
-                    24,42,10
-    CONTROL         "Gradienter",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
-                    236,24,48,10
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Tilbake",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkulator"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Tilbake",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    CTEXT           "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkulator"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON      "Konverter",IDC_BUTTON_CONVERT,35,105,76,17
-    COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Kategori:",IDC_STATIC,4,20,56,8
-    COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Konverter fra:",IDC_STATIC,4,49,56,8
-    COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP | CBS_SORT
-    LTEXT           "Konverter til:",IDC_STATIC,4,76,56,8
-    CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
-    CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "Tilbake",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
-                    BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
-                    40,17
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17
-    CONTROL         "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17
-    CONTROL         "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17
-    CONTROL         "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17
-    CONTROL         "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17
-    CONTROL         "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17
-    CONTROL         "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17
-    CONTROL         "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17
-    CONTROL         "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17
-    CONTROL         "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17
-    CONTROL         "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17
-    CONTROL         ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17
-    CONTROL         "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17
-    CONTROL         "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17
-    CONTROL         "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17
-    CONTROL         "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17
-    CONTROL         "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17
-    CONTROL         "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17
-    CONTROL         "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17
-    CONTROL         "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17
-    CTEXT           "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17
-    CONTROL         "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17
-    CONTROL         "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17
-    CONTROL         "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE
-END
-
-IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  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,4,56,256,88
-    EDITTEXT        IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | 
-                    WS_VSCROLL
-END
-
-IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "statistikk boks"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "RET",IDC_BUTTON_RET,4,48,36,16
-    PUSHBUTTON      "LOAD",IDC_BUTTON_LOAD,44,48,36,16
-    PUSHBUTTON      "CD",IDC_BUTTON_CD,84,48,36,16
-    PUSHBUTTON      "CAD",IDC_BUTTON_CAD,124,48,36,16
-    CTEXT           "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | 
-                    SS_SUNKEN
-END
-
-// Menus
-
-IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
-BEGIN
-    POPUP "Rediger"
-    BEGIN
-        MENUITEM "Kopier\tCTRL-C",              IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V",             IDM_EDIT_PASTE
-    END
-    POPUP "Vis"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig",               IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Konvertering",                IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Heksadesimalt\tF5",           IDM_VIEW_HEX, CHECKED
-        MENUITEM "Desimalt\tF6",                IDM_VIEW_DEC, CHECKED
-        MENUITEM "Oktalt\tF7",                  IDM_VIEW_OCT, CHECKED
-        MENUITEM "Bin<69>rt\tF8",                  IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grader\tF2",                  IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radianer\tF3",                IDM_VIEW_RAD, CHECKED
-        MENUITEM "Gradienter\tF4",              IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Siffergruppering",            IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Hjelp"
-    BEGIN
-        MENUITEM "Emner i hjelp",               IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Om ReactOS Kalkulator",       IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE 
-BEGIN
-    POPUP "Rediger"
-    BEGIN
-        MENUITEM "Kopier\tCTRL-C",              IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V",             IDM_EDIT_PASTE
-    END
-    POPUP "Vis"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig",               IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "konvertering",                IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Heksadesimalt\tF5",           IDM_VIEW_HEX, CHECKED
-        MENUITEM "Desimal\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Oktalt\tF7",                  IDM_VIEW_OCT, CHECKED
-        MENUITEM "Bin<69>rt\tF8",                  IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
-        MENUITEM "Tegn\tF4",                    IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Digital gruppe",              IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Hjelp"
-    BEGIN
-        MENUITEM "Emner i hjelp",               IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Om ReactOS Kalkulator",       IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU DISCARDABLE 
-BEGIN
-    POPUP "Rediger"
-    BEGIN
-        MENUITEM "Kopier\tCTRL-C",              IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V",             IDM_EDIT_PASTE
-    END
-    POPUP "Vis"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig",               IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Konvertering",                IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Siffergruppering",            IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Hjelp"
-    BEGIN
-        MENUITEM "Emner i hjelp",               IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Om Reactos Kalkulator",       IDM_HELP_ABOUT
-    END
-END
-
-// String Tables
-
-STRINGTABLE DISCARDABLE 
-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<67> 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
-
-// Types of conversion
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONV_ANGLE          "Vinkel"
-    IDS_CONV_AREA           "Omr<6D>de"
-    IDS_CONV_CONSUMPTION    "Forbruk (maskin)"
-    IDS_CONV_CURRENCY       "Valuta"
-    IDS_CONV_ENERGY         "Energi"
-    IDS_CONV_LENGTH         "Lengde"
-    IDS_CONV_POWER          "Str<74>m"
-    IDS_CONV_PRESSURE       "Trykk"
-    IDS_CONV_TEMPERATURE    "Temperatur"
-    IDS_CONV_TIME           "Tid"
-    IDS_CONV_VELOCITY       "Hastighet"
-    IDS_CONV_VOLUME         "Volum"
-    IDS_CONV_WEIGHT         "Vekt"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Grader"
-    IDS_ANGLE_GRADIANS      "Gradianer"
-    IDS_ANGLE_RADIANS       "Radianer"
-END
-
-// TYPES OF AREAS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_AREA_ACRES                  "Acres"
-    IDS_AREA_ACRES_BRAZIL           "Acres (Brasil)"
-    IDS_AREA_ACRES_FRANCE           "Acres (France)"
-    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
-    IDS_AREA_ACRES_US               "Acres (US)"
-    IDS_AREA_ARES                   "Ares"
-    IDS_AREA_CHOU                   "Chou"
-    IDS_AREA_DANBO                  "Danbo"
-    IDS_AREA_HECTARES               "Hectares"
-    IDS_AREA_JEONGBO                "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungary)"
-    IDS_AREA_MU                     "Mu"
-    IDS_AREA_PING                   "Ping"
-    IDS_AREA_PYEONG                 "Pyeong"
-    IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
-    IDS_AREA_RAI                    "Rai"
-    IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Kvadrat centimeter"
-    IDS_AREA_SQUARE_CHR             "Kvadrat chr"
-    IDS_AREA_SQUARE_FATHOMS         "Kvadrat fathoms"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Kvadrat fathoms (Hungary)"
-    IDS_AREA_SQUARE_FEET            "Kvadrat feet"
-    IDS_AREA_SQUARE_INCHES          "Kvadrat tommer"
-    IDS_AREA_SQUARE_KILOMETERS      "Kvadrat kilometer"
-    IDS_AREA_SQUARE_LAR             "kvadrat lar"
-    IDS_AREA_SQUARE_METER           "Kvadrat meter"
-    IDS_AREA_SQUARE_MILES           "Kvadrat mil"
-    IDS_AREA_SQUARE_MILLIMETERS     "Kvadrat millimeter"
-    IDS_AREA_SQUARE_SHAKU           "Kvadrat shaku"
-    IDS_AREA_SQUARE_TSUEN           "Kvadrat tsuen"
-    IDS_AREA_SQUARE_VA              "Kvadrat va"
-    IDS_AREA_SQUARE_YARD            "Kvadrat yard"
-    IDS_AREA_TAN                    "Tan"
-    IDS_AREA_TSUBO                  "Tsubo"
-END
-
-// TYPES OF COMSUMPTIONS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
-    IDS_CONSUMPTION_L_PER_100_KM    "Liter/100 kilometer"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Mil/gallon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Mil/gallon (US)"
-END
-
-// TYPES OF CURRENCIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "<22>sterriksk schilling"
-    IDS_CURRENCY_BELGIAN_FRANC      "Belgisk franc"
-    IDS_CURRENCY_CYPRIOT_POUND      "Kypriotisk pound"
-    IDS_CURRENCY_CZECH_KORUNA       "Tsjekkisk koruna"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Tusk Mark"
-    IDS_CURRENCY_DUTCH_GUILDER      "Nederlansk guilder"
-    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_LUXEMBOURG_FRANC   "Luxembourg franc"
-    IDS_CURRENCY_MALTESE_LIRA       "Maltesisk lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portogisisk escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slovansk koruna"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenansk tolar"
-    IDS_CURRENCY_SPANISH_PESETA     "Spansk peseta"
-END
-
-// TYPES OF ENERGIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <20>C calories"
-    IDS_ENERGY_BTUS                 "Britisk varme-enhet"
-    IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Elektrisk-Volt"
-    IDS_ENERGY_FOOT_POUNDS          "Fot-Pound"
-    IDS_ENERGY_IT_CALORIES          "International Table calories"
-    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
-    IDS_ENERGY_JOULES               "Joules"
-    IDS_ENERGY_KILOJOULES           "Kilojoules"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt timer"
-    IDS_ENERGY_NUTRITION_CALORIES   "Ern<72>ring kalori"
-    IDS_ENERGY_TH_CALORIES          "Termokjemisk kalori"
-END
-
-// TYPES OF LENGTHS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angstroms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
-    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
-    IDS_LENGTH_CENTIMETERS          "Centimeter"
-    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
-    IDS_LENGTH_CHI                  "Chi"
-    IDS_LENGTH_CHOU                 "Chou"
-    IDS_LENGTH_CHR                  "Chr"
-    IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "Fathoms"
-    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Ungarn)"
-    IDS_LENGTH_FEET                 "Feet"
-    IDS_LENGTH_FURLONGS             "Furlongs"
-    IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "Hands"
-    IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Tomme"
-    IDS_LENGTH_JA                   "Ja"
-    IDS_LENGTH_JEONG                "Jeong"
-    IDS_LENGTH_KABIET               "Kabiet"
-    IDS_LENGTH_KEN                  "Ken"
-    IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "Kilometer"
-    IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Lysende <20>r"
-    IDS_LENGTH_LINKS_UK             "Linker (UK)"
-    IDS_LENGTH_METERS               "Meters"
-    IDS_LENGTH_MICRONS              "Microns"
-    IDS_LENGTH_MILES                "Mil"
-    IDS_LENGTH_MILLIMETERS          "Millimeter"
-    IDS_LENGTH_NAUTICAL_MILES       "Nautisk mil"
-    IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parsecs"
-    IDS_LENGTH_PICAS                "Picas"
-    IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
-    IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
-    IDS_LENGTH_SAWK                 "Sawk"
-    IDS_LENGTH_SEN                  "Sen"
-    IDS_LENGTH_SHAKU                "Shaku"
-    IDS_LENGTH_SPAN                 "Span"
-    IDS_LENGTH_SUN                  "Sun"
-    IDS_LENGTH_TSUEN                "Tsuen"
-    IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "Yards"
-    IDS_LENGTH_YOTE                 "Yote"
-    IDS_LENGTH_ZHANG                "Zhang"
-END
-
-// TYPES OF POWERS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "Britisk varme-enhet per minutt"
-    IDS_POWER_FPS_PER_MINUTE        "Fot-pund per minutt"
-    IDS_POWER_HORSEPOWER            "Hestekrefter"
-    IDS_POWER_KILOWATTS             "Kilowatt"
-    IDS_POWER_MEGAWATTS             "Megawatt"
-    IDS_POWER_WATTS                 "Watt"
-END
-
-// TYPE OF PRESSURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atmosf<73>retrykk"
-    IDS_PRESSURE_BARS               "Bars"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
-    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
-    IDS_PRESSURE_PASCALS            "Pascals"
-    IDS_PRESSURE_PSI                "Pounds-force per square inch"
-END
-
-// TYPES OF TEMPERATURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS         "Celsius"
-    IDS_TEMPERATURE_FAHRENHEIT      "Fahrenheit"
-    IDS_TEMPERATURE_KELVIN          "Kelvin"
-    IDS_TEMPERATURE_RANKINE         "Rankine"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "**"
-    IDS_TIME_HOURS        "**"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "**"
-    IDS_TIME_MILLISECONDS "**"
-    IDS_TIME_MINUTES      "**"
-    IDS_TIME_SECONDS      "**"
-    IDS_TIME_WEEKS        "**"
-    IDS_TIME_YEARS        "**"
-END
-
-// TYPES OF VELOCITIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimeter/timer"
-    IDS_VELOCITY_FEET_HOUR          "Fot/timer"
-    IDS_VELOCITY_FEET_SECOND        "Fot/sekund"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometer/timer"
-    IDS_VELOCITY_KNOTS              "Knot"
-    IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "Meter/sekunder"
-    IDS_VELOCITY_MILES_HOUR         "Mil/timer"
-END
-
-// TYPES OF VOLUMES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK           "Barrels (UK)"
-    IDS_VOLUME_BARRELS_OIL          "Barrels oil"
-    IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
-    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Kubisk centimeter"
-    IDS_VOLUME_CUBIC_FEET           "Kubisk fot"
-    IDS_VOLUME_CUBIC_INCHES         "Kubisk tomme"
-    IDS_VOLUME_CUBIC_METERS         "Kubisk meter"
-    IDS_VOLUME_CUBIC_YARDS          "Kubisk yards"
-    IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
-    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "Gallons, dry (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liquid (US)"
-    IDS_VOLUME_GOU                  "Gou"
-    IDS_VOLUME_HOP                  "Hop"
-    IDS_VOLUME_ICCE                 "Icce"
-    IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Liter"
-    IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Milliliter"
-    IDS_VOLUME_PINTS_UK             "Pints (UK)"
-    IDS_VOLUME_PINTS_DRY_US         "Pints, dry (US)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquid (US)"
-    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
-    IDS_VOLUME_QUARTS_DRY_US        "Quarts, dry (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquid (US)"
-    IDS_VOLUME_SEKI                 "Seki"
-    IDS_VOLUME_SYOU                 "Syou"
-    IDS_VOLUME_TANANLOUNG           "Tananloung"
-    IDS_VOLUME_TANG                 "Tang"
-    IDS_VOLUME_TO                   "To"
-END
-
-// TYPES OF WEIGHTS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Carats"
-    IDS_WEIGHT_CHUNG                "Chung"
-    IDS_WEIGHT_DON                  "Don"
-    IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Gram"
-    IDS_WEIGHT_GWAN                 "Gwan"
-    IDS_WEIGHT_HARB                 "Harb"
-    IDS_WEIGHT_JIN_CHINA            "Jin (Kina)"
-    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwaner)"
-    IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilogram"
-    IDS_WEIGHT_KIN                  "Kin"
-    IDS_WEIGHT_LIANG_CHINA          "Liang (Kina)"
-    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwaner)"
-    IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
-    IDS_WEIGHT_POUNDS               "Pounds"
-    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
-    IDS_WEIGHT_SALOUNG              "Saloung"
-    IDS_WEIGHT_STONES               "Stones"
-    IDS_WEIGHT_TAMLUNG              "Tamlung"
-    IDS_WEIGHT_TONNES               "Tonnes"
-    IDS_WEIGHT_TONS_UK              "Tons (UK)"
-    IDS_WEIGHT_TONS_US              "Tons (US)"
-END

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

@@ -16,10 +16,14 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -233,7 +237,7 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
@@ -344,37 +348,38 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
 BEGIN
     POPUP "Edycja"
     BEGIN
-        MENUITEM "Kopiuj\tCTRL-C",              IDM_EDIT_COPY
+        MENUITEM "Kopiuj\tCTRL-C",                IDM_EDIT_COPY
         MENUITEM "Wklej\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "Wygl<67>d"
     BEGIN
-        MENUITEM "Standardowy",                 IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy",                     IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Przeliczanie",                IDM_VIEW_CONVERSION
+        MENUITEM "Standardowy",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Przeliczanie",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Szesnastkowo\tF5",            IDM_VIEW_HEX, CHECKED
-        MENUITEM "Dziesi<73>tnie\tF6",             IDM_VIEW_DEC, CHECKED
-        MENUITEM "<22>semkowo\tF7",                IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binarnie\tF8",                IDM_VIEW_BIN, CHECKED
+        MENUITEM "Szesnastkowo\tF5",                     IDM_VIEW_HEX, CHECKED
+        MENUITEM "Dziesi<73>tnie\tF6",                 IDM_VIEW_DEC, CHECKED
+        MENUITEM "<22>semkowo\tF7",                   IDM_VIEW_OCT, CHECKED
+        MENUITEM "Binarnie\tF8",                  IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Stopni\tF2",                  IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radian<61>w\tF3",                IDM_VIEW_RAD, CHECKED
-        MENUITEM "Gradian<61>w\tF4",               IDM_VIEW_GRAD, CHECKED
+        MENUITEM "Stopni\tF2",                 IDM_VIEW_DEG, CHECKED
+        MENUITEM "Radian<61>w\tF3",                 IDM_VIEW_RAD, CHECKED
+        MENUITEM "Gradian<61>w\tF4",                   IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Grupowanie cyfr",             IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupowanie cyfr",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Pomoc"
     BEGIN
-        MENUITEM "Tematy pomocy",               IDM_HELP_HELP
+        MENUITEM "Tematy pomocy",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "O Kalkulatorze ReactOS",      IDM_HELP_ABOUT
+        MENUITEM "O Kalkulatorze ReactOS",          IDM_HELP_ABOUT
     END
 END
 
@@ -382,32 +387,32 @@ IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE
 BEGIN
     POPUP "Edycja"
     BEGIN
-        MENUITEM "Kopiuj\tCTRL-C",              IDM_EDIT_COPY
+        MENUITEM "Kopiuj\tCTRL-C",                IDM_EDIT_COPY
         MENUITEM "Wklej\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "Wygl<67>d"
     BEGIN
-        MENUITEM "Standardowy",                 IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy",                     IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Przeliczanie",                IDM_VIEW_CONVERSION
+        MENUITEM "Standardowy",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Przeliczanie",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Szesnastkowo\tF5",            IDM_VIEW_HEX, CHECKED
-        MENUITEM "Dziesi<73>tnie\tF6",             IDM_VIEW_DEC, CHECKED
-        MENUITEM "<22>semkowo\tF7",                IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binarnie\tF8",                IDM_VIEW_BIN, CHECKED
+        MENUITEM "Szesnastkowo\tF5",                     IDM_VIEW_HEX, CHECKED
+        MENUITEM "Dziesi<73>tnie\tF6",                 IDM_VIEW_DEC, CHECKED
+        MENUITEM "<22>semkowo\tF7",                   IDM_VIEW_OCT, CHECKED
+        MENUITEM "Binarnie\tF8",                  IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
         MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
         MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
         MENUITEM "Bajt\tF4",                    IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Grupowanie cyfr",             IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupowanie cyfr",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Pomoc"
     BEGIN
-        MENUITEM "Tematy pomocy",               IDM_HELP_HELP
+        MENUITEM "Tematy pomocy",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "O Kalkulatorze ReactOS",      IDM_HELP_ABOUT
+        MENUITEM "O Kalkulatorze ReactOS",          IDM_HELP_ABOUT
     END
 END
 
@@ -415,22 +420,22 @@ IDR_MENU_STANDARD MENU DISCARDABLE
 BEGIN
     POPUP "Edycja"
     BEGIN
-        MENUITEM "Kopiuj\tCTRL-C",              IDM_EDIT_COPY
+        MENUITEM "Kopiuj\tCTRL-C",                IDM_EDIT_COPY
         MENUITEM "Wklej\tCTRL-V",               IDM_EDIT_PASTE
     END
     POPUP "Wygl<67>d"
     BEGIN
-        MENUITEM "Standardowy",                 IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy",                     IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Przeliczanie",                IDM_VIEW_CONVERSION
+        MENUITEM "Standardowy",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Przeliczanie",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Grupowanie cyfr",             IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupowanie cyfr",                IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Pomoc"
     BEGIN
-        MENUITEM "Tematy pomocy",               IDM_HELP_HELP
+        MENUITEM "Tematy pomocy",                 IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "O Kalkulatorze ReactOS",      IDM_HELP_ABOUT
+        MENUITEM "O Kalkulatorze ReactOS",          IDM_HELP_ABOUT
     END
 END
 
@@ -443,10 +448,9 @@ BEGIN
     IDS_QUICKHELP           "Szybka pomoc"
 END
 
-// Types of conversion
+// types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "K<>t"
     IDS_CONV_AREA           "Powierzchnia"
     IDS_CONV_CONSUMPTION    "Zu<5A>ycie (silniki)"
     IDS_CONV_CURRENCY       "Waluty"
@@ -455,20 +459,11 @@ BEGIN
     IDS_CONV_POWER          "Moc"
     IDS_CONV_PRESSURE       "Ci<43>nienie"
     IDS_CONV_TEMPERATURE    "Temperatura"
-    IDS_CONV_TIME           "Czas"
     IDS_CONV_VELOCITY       "Pr<50>dko<6B><6F>"
     IDS_CONV_VOLUME         "Obj<62>to<74><6F>"
     IDS_CONV_WEIGHT         "Waga"
 END
 
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Stopnie"
-    IDS_ANGLE_GRADIANS      "Gradiany"
-    IDS_ANGLE_RADIANS       "Radiany"
-END
-
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -489,21 +484,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Centymetry kwadratowe"
-    IDS_AREA_SQUARE_CHR             "Chr kwadratowe"
-    IDS_AREA_SQUARE_FATHOMS         "S<><53>nie kwadratowe"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "S<><53>nie kwadratowe (W<>gry)"
-    IDS_AREA_SQUARE_FEET            "Stopy kwadratowe"
-    IDS_AREA_SQUARE_INCHES          "Cale kwadratowe"
-    IDS_AREA_SQUARE_KILOMETERS      "Kilometry kwadratowe"
-    IDS_AREA_SQUARE_LAR             "Lar kwadratowe"
-    IDS_AREA_SQUARE_METER           "Metry kwadratowe"
-    IDS_AREA_SQUARE_MILES           "Mile kwadratowe"
-    IDS_AREA_SQUARE_MILLIMETERS     "Milimetry kwadratowe"
-    IDS_AREA_SQUARE_SHAKU           "Shaku kwadratowe"
-    IDS_AREA_SQUARE_TSUEN           "Tsuen kwadratowe"
-    IDS_AREA_SQUARE_VA              "Va kwadratowe"
-    IDS_AREA_SQUARE_YARD            "Jardy kwadratowe"
+    IDS_AREA_SQUARE_CENTIMETERS     "Centymetr<EFBFBD>w kwadratowych"
+    IDS_AREA_SQUARE_CHR             "Chr kwadratowych"
+    IDS_AREA_SQUARE_FATHOMS         "S<><53>ni kwadratowych"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "S<><53>ni kwadratowych (W<>gry)"
+    IDS_AREA_SQUARE_FEET            "St<EFBFBD>p kwadratowych"
+    IDS_AREA_SQUARE_INCHES          "Cali kwadratowych"
+    IDS_AREA_SQUARE_KILOMETERS      "Kilometr<EFBFBD>w kwadratowych"
+    IDS_AREA_SQUARE_LAR             "Lar kwadratowych"
+    IDS_AREA_SQUARE_METER           "Metr<EFBFBD>w kwadratowych"
+    IDS_AREA_SQUARE_MILES           "Mil kwadratowych"
+    IDS_AREA_SQUARE_MILLIMETERS     "Milimetr<EFBFBD>w kwadratowych"
+    IDS_AREA_SQUARE_SHAKU           "Shaku kwadratowych"
+    IDS_AREA_SQUARE_TSUEN           "Tsuen kwadratowych"
+    IDS_AREA_SQUARE_VA              "Va kwadratowych"
+    IDS_AREA_SQUARE_YARD            "Jard<EFBFBD>w kwadratowych"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -511,10 +506,10 @@ END
 // TYPES OF COMSUMPTIONS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometry/litr"
-    IDS_CONSUMPTION_L_PER_100_KM    "Litry/100 kilometr<74>w"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Mile/galon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Mile/galon (USA)"
+    IDS_CONSUMPTION_KM_PER_L        "Kilometr<EFBFBD>w/litr"
+    IDS_CONSUMPTION_L_PER_100_KM    "Litr<EFBFBD>w/100 kilometr<74>ws"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Mil/galon (UK)"
+    IDS_CONSUMPTION_MILES_GALLON_US "Mil/galon (USA)"
 END
 
 // TYPES OF CURRENCIES
@@ -523,7 +518,6 @@ BEGIN
     IDS_CURRENCY_AUSTRIAN_SCHILLING "Austriacki szyling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgijski frank"
     IDS_CURRENCY_CYPRIOT_POUND      "Cypryjski funt"
-    IDS_CURRENCY_CZECH_KORUNA       "Czeska korona"
     IDS_CURRENCY_DEUTSCHE_MARK      "Niemiecka marka"
     IDS_CURRENCY_DUTCH_GUILDER      "Holenderki gulden"
     IDS_CURRENCY_EURO               "Euro"
@@ -535,7 +529,6 @@ BEGIN
     IDS_CURRENCY_LUXEMBOURG_FRANC   "Luksemburski frank"
     IDS_CURRENCY_MALTESE_LIRA       "Malta<74>skie liry"
     IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portugalskie escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "S<>owacka korona"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "S<>ove<76>ski tolar"
     IDS_CURRENCY_SPANISH_PESETA     "Hiszpa<70>ska peseta"
 END
@@ -543,60 +536,54 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <EFBFBD>C kalorie"
-    IDS_ENERGY_BTUS                 "British Thermal Unit"
-    IDS_ENERGY_ERGS                 "Ergi"
-    IDS_ENERGY_EVS                  "Elektronowolty"
-    IDS_ENERGY_FOOT_POUNDS          "Stopo-funty"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C kalorii"
+    IDS_ENERGY_ERGS                 "Erg<EFBFBD>w"
     IDS_ENERGY_IT_CALORIES          "Mi<4D>dzynarodowa Tablica kalorii"
-    IDS_ENERGY_IT_KILOCALORIES      "Mi<4D>dzynarodowa Tablica kilokalorii"
-    IDS_ENERGY_JOULES               "D<EFBFBD>ule"
-    IDS_ENERGY_KILOJOULES           "Kilod<EFBFBD>ule"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatogodziny"
-    IDS_ENERGY_NUTRITION_CALORIES   "Kalorie spo<70>ywcze"
-    IDS_ENERGY_TH_CALORIES          "Kalorie termochemiczne"
+    IDS_ENERGY_JOULES               "D<>uli"
+    IDS_ENERGY_KILOJOULES           "Kilod<EFBFBD>uli"
+    IDS_ENERGY_KILOWATT_HOURS       "Kilowatogodzin"
+    IDS_ENERGY_NUTRITION_CALORIES   "Kalorii spo<70>ywczych"
+    IDS_ENERGY_TH_CALORIES          "Kalorii termochemicznych"
 END
 
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angsztremy"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Jednostki Astronomiczne"
-    IDS_LENGTH_BARLEYCORNS          "Palce"
-    IDS_LENGTH_CENTIMETERS          "Centymetry"
+    IDS_LENGTH_ANGSTROMS            "Angsztrem<EFBFBD>w"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Jednostek Astronomicznych"
+    IDS_LENGTH_BARLEYCORNS          "Palc<EFBFBD>w"
+    IDS_LENGTH_CENTIMETERS          "Centimetr<EFBFBD>w"
     IDS_LENGTH_CHAINS_UK            "Chains (UK)"
     IDS_LENGTH_CHI                  "Chi"
     IDS_LENGTH_CHOU                 "Chou"
     IDS_LENGTH_CHR                  "Chr"
     IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "S<><53>nie"
-    IDS_LENGTH_FATHOMS_HUNGARY      "S<><53>nie (W<>gry)"
-    IDS_LENGTH_FEET                 "Stopy"
+    IDS_LENGTH_FATHOMS              "S<><53>ni"
+    IDS_LENGTH_FATHOMS_HUNGARY      "S<><53>ni (W<>gry)"
+    IDS_LENGTH_FEET                 "St<EFBFBD>p"
     IDS_LENGTH_FURLONGS             "Furlongs"
     IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "D<>onie"
+    IDS_LENGTH_HANDS                "D<>oni"
     IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Cale"
+    IDS_LENGTH_INCHES               "Cali"
     IDS_LENGTH_JA                   "Ja"
     IDS_LENGTH_JEONG                "Jeong"
     IDS_LENGTH_KABIET               "Kabiet"
     IDS_LENGTH_KEN                  "Ken"
     IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "Kilometry"
+    IDS_LENGTH_KILOMETERS           "Kilometer<EFBFBD>w"
     IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Lata <20>wietlne"
+    IDS_LENGTH_LIGHT_YEARS          "Lat <20>wietlnych"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
-    IDS_LENGTH_METERS               "Metry"
-    IDS_LENGTH_MICRONS              "Mikrometry"
-    IDS_LENGTH_MILES                "Mile"
-    IDS_LENGTH_MILLIMETERS          "Milimetry"
-    IDS_LENGTH_NAUTICAL_MILES       "Mile morskie"
+    IDS_LENGTH_METERS               "Metr<EFBFBD>w"
+    IDS_LENGTH_MILES                "Mil"
+    IDS_LENGTH_MILLIMETERS          "Millimetr<EFBFBD>w"
+    IDS_LENGTH_NAUTICAL_MILES       "Mil morskich"
     IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parseki"
+    IDS_LENGTH_PARSECS              "Parsek<EFBFBD>w"
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -604,7 +591,7 @@ BEGIN
     IDS_LENGTH_SUN                  "Sun"
     IDS_LENGTH_TSUEN                "Tsuen"
     IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "Jardy"
+    IDS_LENGTH_YARDS                "Jard<EFBFBD>w"
     IDS_LENGTH_YOTE                 "Yote"
     IDS_LENGTH_ZHANG                "Zhang"
 END
@@ -612,24 +599,20 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "BTU na minut<75>"
-    IDS_POWER_FPS_PER_MINUTE        "Stopo-funty na minut<EFBFBD>"
-    IDS_POWER_HORSEPOWER            "Konie mechaniczne"
-    IDS_POWER_KILOWATTS             "Kilowaty"
-    IDS_POWER_MEGAWATTS             "Megawaty"
-    IDS_POWER_WATTS                 "Waty"
+    IDS_POWER_HORSEPOWER            "Koni mechanicznych"
+    IDS_POWER_KILOWATTS             "Kilowat<EFBFBD>w"
+    IDS_POWER_MEGAWATTS             "Megawat<61>w"
+    IDS_POWER_WATTS                 "Wat<61>w"
 END
 
 // TYPE OF PRESSURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atmosfery"
-    IDS_PRESSURE_BARS               "Bary"
-    IDS_PRESSURE_HECTOPASCALS       "Hektopaskale"
-    IDS_PRESSURE_KILOPASCALS        "Kilopaskale"
-    IDS_PRESSURE_MM_OF_MERCURY      "Milimetry s<>upka rt<72>ci"
-    IDS_PRESSURE_PASCALS            "Paskale"
-    IDS_PRESSURE_PSI                "Funty na cal kwadratowy"
+    IDS_PRESSURE_ATMOSPHERES        "Atmosfer"
+    IDS_PRESSURE_BARS               "Bar<EFBFBD>w"
+    IDS_PRESSURE_MM_OF_MERCURY      "Millimetr<74>w s<>upka rt<72>ci"
+    IDS_PRESSURE_PASCALS            "Paskali"
+    IDS_PRESSURE_PSI                "Funt<6E>w na cal kwadratowy"
 END
 
 // TYPES OF TEMPERATURES
@@ -641,65 +624,49 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankina"
 END
 
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Dni"
-    IDS_TIME_HOURS        "Godziny"
-    IDS_TIME_NANOSECONDS  "Nanosekundy"
-    IDS_TIME_MICROSECONDS "Mikrosekundy"
-    IDS_TIME_MILLISECONDS "Milisekundy"
-    IDS_TIME_MINUTES      "Minuty"
-    IDS_TIME_SECONDS      "Sekundy"
-    IDS_TIME_WEEKS        "Tygodnie"
-    IDS_TIME_YEARS        "Lata"
-END
-
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centymetry/sekund<EFBFBD>"
-    IDS_VELOCITY_FEET_HOUR          "Stopy/godzin<69>"
-    IDS_VELOCITY_FEET_SECOND        "Stopy/sekund<6E>"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometry/godzin<69>"
-    IDS_VELOCITY_KNOTS              "W<>z<EFBFBD>y"
-    IDS_VELOCITY_MACH               "Machy"
-    IDS_VELOCITY_METERS_SECOND      "Metry/sekund<6E>"
-    IDS_VELOCITY_MILES_HOUR         "Mile/godzin<69>"
+    IDS_VELOCITY_FEET_HOUR          "St<53>p/godzin<EFBFBD>"
+    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometr<74>w/godzin<69>"
+    IDS_VELOCITY_KNOTS              "W<>z<EFBFBD><7A>w"
+    IDS_VELOCITY_MACH               "Mach<63>w"
+    IDS_VELOCITY_METERS_SECOND      "Metr<74>w/sekund<6E>"
+    IDS_VELOCITY_MILES_HOUR         "Mil/godzin<69>"
 END
 
 // TYPES OF VOLUMES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK           "Bary<72>ki (UK)"
-    IDS_VOLUME_BARRELS_OIL          "Bary<72>ki"
+    IDS_VOLUME_BARRELS_UK           "Bary<72>ek (UK)"
+    IDS_VOLUME_BARRELS_OIL          "Bary<72>ek"
     IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Buszle (UK)"
-    IDS_VOLUME_BUSHELS_US           "Buszle (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Centymetry sze<7A>cienne"
-    IDS_VOLUME_CUBIC_FEET           "Stopy sze<7A>cienne"
-    IDS_VOLUME_CUBIC_INCHES         "Cale sze<7A>cienne"
-    IDS_VOLUME_CUBIC_METERS         "Metry sze<7A>cienne"
-    IDS_VOLUME_CUBIC_YARDS          "Jardy sze<7A>cienne"
+    IDS_VOLUME_BUSHELS_UK           "Buszli (UK)"
+    IDS_VOLUME_BUSHELS_US           "Buszli (US)"
+    IDS_VOLUME_CUBIC_CENTIMETERS    "Centymetr<EFBFBD>w sze<7A>ciennych"
+    IDS_VOLUME_CUBIC_FEET           "St<EFBFBD>p sze<7A>ciennych"
+    IDS_VOLUME_CUBIC_INCHES         "Cali sze<7A>ciennych"
+    IDS_VOLUME_CUBIC_METERS         "Metr<EFBFBD>w sze<7A>ciennych"
+    IDS_VOLUME_CUBIC_YARDS          "Jard<EFBFBD>w sze<7A>ciennych"
     IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Uncje, p<>yn (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Uncje, p<>yn (US)"
-    IDS_VOLUME_GALLONS_UK           "Galony (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "Galony, sypkie (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Galony, p<>yn (US)"
+    IDS_VOLUME_FLUID_OUNCES_UK      "Uncji, p<>yn (UK)"
+    IDS_VOLUME_FLUID_OUNCES_US      "Uncji, p<>yn (US)"
+    IDS_VOLUME_GALLONS_UK           "Galon<EFBFBD>w (UK)"
+    IDS_VOLUME_GALLONS_DRY_US       "Galon<EFBFBD>w, sypkie (US)"
+    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, p<>yn (US)"
     IDS_VOLUME_GOU                  "Gou"
     IDS_VOLUME_HOP                  "Hop"
     IDS_VOLUME_ICCE                 "Icce"
     IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Litry"
+    IDS_VOLUME_LITERS               "Litr<EFBFBD>w"
     IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Mililitry"
-    IDS_VOLUME_PINTS_UK             "Pinty (UK)"
-    IDS_VOLUME_PINTS_DRY_US         "Pinty, sypkie (US)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pinty, p<>yn (US)"
-    IDS_VOLUME_QUARTS_UK            "Kwarty (UK)"
-    IDS_VOLUME_QUARTS_DRY_US        "Kwarty, sypkie (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Kwarty, p<>yn (US)"
+    IDS_VOLUME_MILLILITERS          "Milliliters"
+    IDS_VOLUME_PINTS_UK             "Pint (UK)"
+    IDS_VOLUME_PINTS_DRY_US         "Pint, sypkie (US)"
+    IDS_VOLUME_PINTS_LIQUID_US      "Pint, p<>yn (US)"
+    IDS_VOLUME_QUARTS_UK            "Kwart (UK)"
+    IDS_VOLUME_QUARTS_DRY_US        "Kwart, sypkie (US)"
+    IDS_VOLUME_QUARTS_LIQUID_US     "Kwart, p<>yn (US)"
     IDS_VOLUME_SEKI                 "Seki"
     IDS_VOLUME_SYOU                 "Syou"
     IDS_VOLUME_TANANLOUNG           "Tananloung"
@@ -710,26 +677,26 @@ END
 // TYPES OF WEIGHTS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_WEIGHT_BAHT                 "Bahty"
-    IDS_WEIGHT_CARATS               "Karaty"
+    IDS_WEIGHT_BAHT                 "Baht<EFBFBD>w"
+    IDS_WEIGHT_CARATS               "Karat<EFBFBD>w"
     IDS_WEIGHT_CHUNG                "Chung"
     IDS_WEIGHT_DON                  "Don"
     IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Gramy"
+    IDS_WEIGHT_GRAMS                "Gram<EFBFBD>w"
     IDS_WEIGHT_GWAN                 "Gwan"
     IDS_WEIGHT_HARB                 "Harb"
     IDS_WEIGHT_JIN_CHINA            "Jin (China)"
     IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
     IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilogramy"
+    IDS_WEIGHT_KILOGRAMS            "Kilogram<EFBFBD>w"
     IDS_WEIGHT_KIN                  "Kin"
     IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
     IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
     IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Uncje, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Uncje, aptekarskie"
-    IDS_WEIGHT_POUNDS               "Funty"
-    IDS_WEIGHT_QUINTAL_METRIC       "Kwintale"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Uncji, avoirdupois"
+    IDS_WEIGHT_OUNCES_TROY          "Uncji, aptekarskie"
+    IDS_WEIGHT_POUNDS               "Funt<EFBFBD>w"
+    IDS_WEIGHT_QUINTAL_METRIC       "Kwintali"
     IDS_WEIGHT_SALOUNG              "Saloung"
     IDS_WEIGHT_STONES               "Kamieni"
     IDS_WEIGHT_TAMLUNG              "Tamlung"

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

@@ -1,736 +0,0 @@
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-
-#pragma code_page(65001)
-
-// Dialog
-
-IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatorul ReactOS"
-MENU IDR_MENU_SCIENTIFIC_1
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
-    GROUPBOX        "",IDC_STATIC,4,36,76,21
-    CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,8,44,26,10
-    CONTROL         "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,40,44,29,10
-    CTEXT           "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CTEXT           "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sau",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Şi",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    GROUPBOX        "",IDC_STATIC,140,16,172,21
-    CONTROL         "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,148,24,37,10
-    CONTROL         "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,188,24,37,10
-    CONTROL         "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,232,24,33,10
-    CONTROL         "Octet",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,272,24,30,10
-    CONTROL         "Grade",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24,
-                    42,10
-    CONTROL         "Radiani",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192,
-                    24,42,10
-    CONTROL         "Gradiani",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
-                    236,24,44,10
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Înapoi",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatorul ReactOS"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Înapoi",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Radical",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    CTEXT           "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatorul ReactOS"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON      "Conversie",IDC_BUTTON_CONVERT,35,105,76,17
-    COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Categorie:",IDC_STATIC,4,20,56,8
-    COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Conversie din:",IDC_STATIC,4,49,56,8
-    COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP | CBS_SORT
-    LTEXT           "Conversie in:",IDC_STATIC,4,76,56,8
-    CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
-    CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "Înapoi",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
-                    BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
-                    40,17
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17
-    CONTROL         "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17
-    CONTROL         "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17
-    CONTROL         "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17
-    CONTROL         "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17
-    CONTROL         "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17
-    CONTROL         "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17
-    CONTROL         "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17
-    CONTROL         "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17
-    CONTROL         "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17
-    CONTROL         "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17
-    CONTROL         ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17
-    CONTROL         "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17
-    CONTROL         "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17
-    CONTROL         "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17
-    CONTROL         "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17
-    CONTROL         "Radical",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17
-    CONTROL         "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17
-    CONTROL         "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17
-    CONTROL         "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17
-    CTEXT           "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17
-    CONTROL         "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17
-    CONTROL         "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17
-    CONTROL         "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE
-END
-
-IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  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           "Calculatorul 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,4,56,256,88
-    EDITTEXT        IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | 
-                    WS_VSCROLL
-END
-
-IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Statistics box"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "RET",IDC_BUTTON_RET,4,48,36,16
-    PUSHBUTTON      "LOAD",IDC_BUTTON_LOAD,44,48,36,16
-    PUSHBUTTON      "CD",IDC_BUTTON_CD,84,48,36,16
-    PUSHBUTTON      "CAD",IDC_BUTTON_CAD,124,48,36,16
-    CTEXT           "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | 
-                    SS_SUNKEN
-END
-
-// Menus
-
-IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
-BEGIN
-    POPUP "Editare"
-    BEGIN
-        MENUITEM "Copiere\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "Lipire\tCTRL-V",               IDM_EDIT_PASTE
-    END
-    POPUP "Vizualizare"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Ştiințific",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Conversie",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
-        MENUITEM "Zecimal\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Octal\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binar\tF8",                  IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grade\tF2",                 IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radiani\tF3",                 IDM_VIEW_RAD, CHECKED
-        MENUITEM "Gradiani\tF4",                IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grupare cifre",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Ajutor"
-    BEGIN
-        MENUITEM "Topici de ajutor",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Despre Calculatorul ReactOS",          IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE 
-BEGIN
-    POPUP "Editare"
-    BEGIN
-        MENUITEM "Copiere\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "Lipire\tCTRL-V",               IDM_EDIT_PASTE
-    END
-    POPUP "Vizualizare"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Ştiințific",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Conversie",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
-        MENUITEM "Zecimal\tF6",                 IDM_VIEW_DEC, CHECKED
-        MENUITEM "Octal\tF7",                   IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binar\tF8",                  IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
-        MENUITEM "Octet\tF4",                    IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grupare cifre",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Ajutor"
-    BEGIN
-        MENUITEM "Topici de ajutor",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Despre Calculatorul ReactOS",          IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU DISCARDABLE 
-BEGIN
-    POPUP "Editare"
-    BEGIN
-        MENUITEM "Copiere\tCTRL-C",                IDM_EDIT_COPY
-        MENUITEM "Lipire\tCTRL-V",               IDM_EDIT_PASTE
-    END
-    POPUP "Vizualizare"
-    BEGIN
-        MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Ştiințific",                  IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "Conversie",                  IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Grupare cifre",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Ajutor"
-    BEGIN
-        MENUITEM "Topici de ajutor",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Despre Calculatorul ReactOS",          IDM_HELP_ABOUT
-    END
-END
-
-// String Tables
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_STRING_LICENSE      "ReactOS Calc este software liber sub licența GNU GPL. \r\n\r\nGăsiți o copie a acestei licențe aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea găsiți traduceri ale aceste licențe aici:\r\nhttp://www.gnu.org/licenses/translations.html\r\nTraducerea în limba română de Petru Dimitriu."
-    IDS_MATH_ERROR          "Eroare"
-    IDS_QUICKHELP           "Ajutor rapid"
-END
-
-// Types of conversion
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONV_ANGLE          "Unghi"
-    IDS_CONV_AREA           "Suprafață"
-    IDS_CONV_CONSUMPTION    "Consum (motoare)"
-    IDS_CONV_CURRENCY       "Valută"
-    IDS_CONV_ENERGY         "Energie"
-    IDS_CONV_LENGTH         "Lungimi"
-    IDS_CONV_POWER          "Putere"
-    IDS_CONV_PRESSURE       "Presiune"
-    IDS_CONV_TEMPERATURE    "Temperatură"
-    IDS_CONV_TIME           "Timp"
-    IDS_CONV_VELOCITY       "Velocitate"
-    IDS_CONV_VOLUME         "Volum"
-    IDS_CONV_WEIGHT         "Masă"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "Grade"
-    IDS_ANGLE_GRADIANS      "Gradiani"
-    IDS_ANGLE_RADIANS       "Radiani"
-END
-
-// TYPES OF AREAS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_AREA_ACRES                  "Acri"
-    IDS_AREA_ACRES_BRAZIL           "Acri (Brazilia)"
-    IDS_AREA_ACRES_FRANCE           "Acri (Franța)"
-    IDS_AREA_ACRES_SCOTS            "Acri (Scots)"
-    IDS_AREA_ACRES_US               "Acri (SUA)"
-    IDS_AREA_ARES                   "Ares"
-    IDS_AREA_CHOU                   "Chou"
-    IDS_AREA_DANBO                  "Danbo"
-    IDS_AREA_HECTARES               "Hectare"
-    IDS_AREA_JEONGBO                "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY         "Morgen (Ungaria)"
-    IDS_AREA_MU                     "Mu"
-    IDS_AREA_PING                   "Ping"
-    IDS_AREA_PYEONG                 "Pyeong"
-    IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
-    IDS_AREA_RAI                    "Rai"
-    IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Centimetri pătrați"
-    IDS_AREA_SQUARE_CHR             "Chr pătrați"
-    IDS_AREA_SQUARE_FATHOMS         "Fathomi pătrați"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Fathomi pătrați (Ungaria)"
-    IDS_AREA_SQUARE_FEET            "Picioare pătrate"
-    IDS_AREA_SQUARE_INCHES          "țoli pătrați"
-    IDS_AREA_SQUARE_KILOMETERS      "Kilometri pătrați"
-    IDS_AREA_SQUARE_LAR             "Lar pătrați"
-    IDS_AREA_SQUARE_METER           "Metri pătrați"
-    IDS_AREA_SQUARE_MILES           "Mile pătrate"
-    IDS_AREA_SQUARE_MILLIMETERS     "Milimetri pătrați"
-    IDS_AREA_SQUARE_SHAKU           "Shaku pătrați"
-    IDS_AREA_SQUARE_TSUEN           "Tsuen pătrați"
-    IDS_AREA_SQUARE_VA              "Va pătrați"
-    IDS_AREA_SQUARE_YARD            "Yarzi pătrați"
-    IDS_AREA_TAN                    "Tan"
-    IDS_AREA_TSUBO                  "Tsubo"
-END
-
-// TYPES OF COMSUMPTIONS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometri/litru"
-    IDS_CONSUMPTION_L_PER_100_KM    "Litri/100 kilometri"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Mile/galon (Marea Britanie)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Mile/galon (SUA)"
-END
-
-// TYPES OF CURRENCIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Şiling autriac"
-    IDS_CURRENCY_BELGIAN_FRANC      "Franc belgian"
-    IDS_CURRENCY_CYPRIOT_POUND      "Liră cipriotă"
-    IDS_CURRENCY_CZECH_KORUNA       "Coroană cehă"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Marcă nemțească"
-    IDS_CURRENCY_DUTCH_GUILDER      "Guilder olandez"
-    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_LUXEMBOURG_FRANC   "Franc luxemburghez"
-    IDS_CURRENCY_MALTESE_LIRA       "Litră malteză"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Escudo portughez"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Coroană slovacă"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Tolar sloven"
-    IDS_CURRENCY_SPANISH_PESETA     "Peseta spaniolă"
-END
-
-// TYPES OF ENERGIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES        "Calorii 15 °C"
-    IDS_ENERGY_BTUS                 "Unități termale britanice"
-    IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Electron-Volți"
-    IDS_ENERGY_FOOT_POUNDS          "Picioare-Livră"
-    IDS_ENERGY_IT_CALORIES          "Calorii Tabel Internațional"
-    IDS_ENERGY_IT_KILOCALORIES      "Kilocalorii Tabel Internațional"
-    IDS_ENERGY_JOULES               "Jouli"
-    IDS_ENERGY_KILOJOULES           "KiloJouli"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt ore"
-    IDS_ENERGY_NUTRITION_CALORIES   "Calorii nutriție"
-    IDS_ENERGY_TH_CALORIES          "Calorie termochimică"
-END
-
-// TYPES OF LENGTHS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS            "Ångströms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Unități astronomice"
-    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
-    IDS_LENGTH_CENTIMETERS          "Centimetri"
-    IDS_LENGTH_CHAINS_UK            "Chains (Marea Britanie)"
-    IDS_LENGTH_CHI                  "Chi"
-    IDS_LENGTH_CHOU                 "Chou"
-    IDS_LENGTH_CHR                  "Chr"
-    IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "Fathoms"
-    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Ungaria)"
-    IDS_LENGTH_FEET                 "Picioare"
-    IDS_LENGTH_FURLONGS             "Furlongs"
-    IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "Hands"
-    IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Incii (țoli)"
-    IDS_LENGTH_JA                   "Ja"
-    IDS_LENGTH_JEONG                "Jeong"
-    IDS_LENGTH_KABIET               "Kabiet"
-    IDS_LENGTH_KEN                  "Ken"
-    IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "Kilometeri"
-    IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Ani lumină"
-    IDS_LENGTH_LINKS_UK             "Links (Marea Britanie)"
-    IDS_LENGTH_METERS               "Metri"
-    IDS_LENGTH_MICRONS              "Microni"
-    IDS_LENGTH_MILES                "Mile"
-    IDS_LENGTH_MILLIMETERS          "Milimetri"
-    IDS_LENGTH_NAUTICAL_MILES       "Mile nautice"
-    IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parsecs"
-    IDS_LENGTH_PICAS                "Picas"
-    IDS_LENGTH_RI_JAPAN             "Ri (Japonia)"
-    IDS_LENGTH_RI_KOREA             "Ri (Corea)"
-    IDS_LENGTH_RODS                 "Rods"
-    IDS_LENGTH_SAWK                 "Sawk"
-    IDS_LENGTH_SEN                  "Sen"
-    IDS_LENGTH_SHAKU                "Shaku"
-    IDS_LENGTH_SPAN                 "Span"
-    IDS_LENGTH_SUN                  "Sun"
-    IDS_LENGTH_TSUEN                "Tsuen"
-    IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "Yards"
-    IDS_LENGTH_YOTE                 "Yote"
-    IDS_LENGTH_ZHANG                "Zhang"
-END
-
-// TYPES OF POWERS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "Unități termice britanice pe minut"
-    IDS_POWER_FPS_PER_MINUTE        "Picior-livre pe minut"
-    IDS_POWER_HORSEPOWER            "Cai putere"
-    IDS_POWER_KILOWATTS             "Kilowați"
-    IDS_POWER_MEGAWATTS             "Megawați"
-    IDS_POWER_WATTS                 "Wați"
-END
-
-// TYPE OF PRESSURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atmosfere"
-    IDS_PRESSURE_BARS               "Bari"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascali"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascali"
-    IDS_PRESSURE_MM_OF_MERCURY      "Milimetri coloană de mercur"
-    IDS_PRESSURE_PASCALS            "Pascali"
-    IDS_PRESSURE_PSI                "Livre-forță pe țol pătrat"
-END
-
-// TYPES OF TEMPERATURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS         "Celsius"
-    IDS_TEMPERATURE_FAHRENHEIT      "Fahrenheit"
-    IDS_TEMPERATURE_KELVIN          "Kelvin"
-    IDS_TEMPERATURE_RANKINE         "Rankine"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Zile"
-    IDS_TIME_HOURS        "Ore"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Microsecunde"
-    IDS_TIME_MILLISECONDS "Milisecunde"
-    IDS_TIME_MINUTES      "Minute"
-    IDS_TIME_SECONDS      "Secunde"
-    IDS_TIME_WEEKS        "Săptămâni"
-    IDS_TIME_YEARS        "Ani"
-END
-
-// TYPES OF VELOCITIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimetri/oră"
-    IDS_VELOCITY_FEET_HOUR          "Picioare/oră"
-    IDS_VELOCITY_FEET_SECOND        "Picioare/secundă"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometri/ore"
-    IDS_VELOCITY_KNOTS              "Nod"
-    IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "Metri/secundă"
-    IDS_VELOCITY_MILES_HOUR         "Mile/oră"
-END
-
-// TYPES OF VOLUMES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK           "Barili (Marea Britanie)"
-    IDS_VOLUME_BARRELS_OIL          "Barili de petrol"
-    IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Bushels (Marea Britanie)"
-    IDS_VOLUME_BUSHELS_US           "Bushels (SUA)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Centrimetri cubi"
-    IDS_VOLUME_CUBIC_FEET           "Picioare^3"
-    IDS_VOLUME_CUBIC_INCHES         "țoli cubi"
-    IDS_VOLUME_CUBIC_METERS         "Metri cubi"
-    IDS_VOLUME_CUBIC_YARDS          "Yarzi cubi"
-    IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (Marea Britanie)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (SUA)"
-    IDS_VOLUME_GALLONS_UK           "Galoni (Marea Britanie)"
-    IDS_VOLUME_GALLONS_DRY_US       "Galoni, uscat (SUA)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Galoni, lichid (SUA)"
-    IDS_VOLUME_GOU                  "Gou"
-    IDS_VOLUME_HOP                  "Hop"
-    IDS_VOLUME_ICCE                 "Icce"
-    IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Litri"
-    IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Mililitri"
-    IDS_VOLUME_PINTS_UK             "Pints (Marea Britanie)"
-    IDS_VOLUME_PINTS_DRY_US         "Pints, uscat (SUA)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pints, lichid (SUA)"
-    IDS_VOLUME_QUARTS_UK            "Quarts (Marea Britanie)"
-    IDS_VOLUME_QUARTS_DRY_US        "Quarts, uscat (SUA)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, lichid (SUA)"
-    IDS_VOLUME_SEKI                 "Seki"
-    IDS_VOLUME_SYOU                 "Syou"
-    IDS_VOLUME_TANANLOUNG           "Tananloung"
-    IDS_VOLUME_TANG                 "Tang"
-    IDS_VOLUME_TO                   "To"
-END
-
-// TYPES OF WEIGHTS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Carate"
-    IDS_WEIGHT_CHUNG                "Chung"
-    IDS_WEIGHT_DON                  "Don"
-    IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Grame"
-    IDS_WEIGHT_GWAN                 "Gwan"
-    IDS_WEIGHT_HARB                 "Harb"
-    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
-    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
-    IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilograme"
-    IDS_WEIGHT_KIN                  "Kin"
-    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
-    IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Uncii, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Uncii, troy"
-    IDS_WEIGHT_POUNDS               "Livre"
-    IDS_WEIGHT_QUINTAL_METRIC       "Chintale (metric)"
-    IDS_WEIGHT_SALOUNG              "Saloung"
-    IDS_WEIGHT_STONES               "Stones"
-    IDS_WEIGHT_TAMLUNG              "Tamlung"
-    IDS_WEIGHT_TONNES               "Tonnes"
-    IDS_WEIGHT_TONS_UK              "Tone (Marea Britanie)"
-    IDS_WEIGHT_TONS_US              "Tone (SUA)"
-END
-
-#pragma code_page(default)

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

@@ -9,10 +9,14 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -226,21 +230,21 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS"
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    PUSHBUTTON      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_BUTTON_CONVERT,35,105,76,17
+    PUSHBUTTON      "Convert",IDC_BUTTON_CONVERT,35,105,76,17
     COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,4,20,56,8
+    LTEXT           "Category:",IDC_STATIC,4,20,56,8
     COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>:",IDC_STATIC,4,49,75,8
+    LTEXT           "Convert from:",IDC_STATIC,4,49,56,8
     COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP | CBS_SORT
-    LTEXT           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>:",IDC_STATIC,4,76,75,8
+    LTEXT           "Convert to:",IDC_STATIC,4,76,56,8
     CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
     CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
@@ -337,6 +341,7 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -431,7 +436,7 @@ END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_STRING_LICENSE      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU GPL.\r\n\r\n<><6E> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU GPL <20><><EFBFBD><EFBFBD><EFBFBD>:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> c <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU GPL <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>:\r\nhttp://www.gnu.org/licenses/translations.html"
+    IDS_STRING_LICENSE      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU GPL.\r\n\r\n<><6E> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU GPL <20><><EFBFBD><EFBFBD><EFBFBD>:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU GPL <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_QUICKHELP           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 END
@@ -439,294 +444,256 @@ END
 // types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_AREA           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_CONSUMPTION    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_CONV_CURRENCY       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_ENERGY         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_LENGTH         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_POWER          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_PRESSURE       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_TEMPERATURE    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_TIME           "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_VELOCITY       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_VOLUME         "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_WEIGHT         "<22><><EFBFBD>"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ANGLE_GRADIANS      "<22><><EFBFBD><EFBFBD>"
-    IDS_ANGLE_RADIANS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_CONV_AREA           "Area"
+    IDS_CONV_CONSUMPTION    "Consumption (engines)"
+    IDS_CONV_CURRENCY       "Currencies"
+    IDS_CONV_ENERGY         "Energy"
+    IDS_CONV_LENGTH         "Lenghts"
+    IDS_CONV_POWER          "Power"
+    IDS_CONV_PRESSURE       "Pressure"
+    IDS_CONV_TEMPERATURE    "Temperature"
+    IDS_CONV_VELOCITY       "Velocity"
+    IDS_CONV_VOLUME         "Volume"
+    IDS_CONV_WEIGHT         "Weights"
 END
 
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_AREA_ACRES                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_ACRES_BRAZIL           "<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_FRANCE           "<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_SCOTS            "<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_US               "<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_AREA_ARES                   "<EFBFBD><EFBFBD>"
-    IDS_AREA_CHOU                   "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_DANBO                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_HECTARES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_JEONGBO                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_MORGEN_HUNGARY         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_MU                     "<EFBFBD><EFBFBD>"
-    IDS_AREA_PING                   "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_PYEONG                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_PYEONGBANGJA           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_RAI                    "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SE                     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_CENTIMETERS     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_CHR             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>"
-    IDS_AREA_SQUARE_FATHOMS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_SQUARE_FEET            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_AREA_SQUARE_INCHES          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_KILOMETERS      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_LAR             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_AREA_SQUARE_METER           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_MILES           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_MILLIMETERS     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_SHAKU           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_TSUEN           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_VA              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>"
-    IDS_AREA_SQUARE_YARD            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_AREA_TAN                    "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_TSUBO                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_AREA_ACRES                  "Acres"
+    IDS_AREA_ACRES_BRAZIL           "Acres (Brazil)"
+    IDS_AREA_ACRES_FRANCE           "Acres (France)"
+    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
+    IDS_AREA_ACRES_US               "Acres (US)"
+    IDS_AREA_ARES                   "Ares"
+    IDS_AREA_CHOU                   "Chou"
+    IDS_AREA_DANBO                  "Danbo"
+    IDS_AREA_HECTARES               "Hectares"
+    IDS_AREA_JEONGBO                "Jeongbo"
+    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungary)"
+    IDS_AREA_MU                     "Mu"
+    IDS_AREA_PING                   "Ping"
+    IDS_AREA_PYEONG                 "Pyeong"
+    IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
+    IDS_AREA_RAI                    "Rai"
+    IDS_AREA_SE                     "Se"
+    IDS_AREA_SQUARE_CENTIMETERS     "Square centimeters"
+    IDS_AREA_SQUARE_CHR             "Square chr"
+    IDS_AREA_SQUARE_FATHOMS         "Square fathoms"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
+    IDS_AREA_SQUARE_FEET            "Square feet"
+    IDS_AREA_SQUARE_INCHES          "Square inches"
+    IDS_AREA_SQUARE_KILOMETERS      "Square kilometers"
+    IDS_AREA_SQUARE_LAR             "Square lar"
+    IDS_AREA_SQUARE_METER           "Square meter"
+    IDS_AREA_SQUARE_MILES           "Square miles"
+    IDS_AREA_SQUARE_MILLIMETERS     "Square millimeters"
+    IDS_AREA_SQUARE_SHAKU           "Square shaku"
+    IDS_AREA_SQUARE_TSUEN           "Square tsuen"
+    IDS_AREA_SQUARE_VA              "Square va"
+    IDS_AREA_SQUARE_YARD            "Square yard"
+    IDS_AREA_TAN                    "Tan"
+    IDS_AREA_TSUBO                  "Tsubo"
 END
 
 // TYPES OF COMSUMPTIONS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD>"
-    IDS_CONSUMPTION_L_PER_100_KM    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/100 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONSUMPTION_MILES_GALLON_UK "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_CONSUMPTION_MILES_GALLON_US "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
+    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
+    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometers"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
+    IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
 END
 
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_BELGIAN_FRANC      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_CYPRIOT_POUND      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_CZECH_KORUNA       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_DEUTSCHE_MARK      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_DUTCH_GUILDER      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_EURO               "<22><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_FINNISH_MARKKA     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_FRENCH_FRANC       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_GREEK_DRACHMA      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_IRISH_POUND        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_ITALIAN_LIRA       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_MALTESE_LIRA       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_SLOVAK_KORUNA      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_SPANISH_PESETA     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
+    IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
+    IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
+    IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
+    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
+    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_LUXEMBOURG_FRANC   "Luxembourg franc"
+    IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
+    IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
+    IDS_CURRENCY_SPANISH_PESETA     "Spanish peseta"
 END
 
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_BTUS                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_ERGS                 "<22><><EFBFBD>"
-    IDS_ENERGY_EVS                  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_FOOT_POUNDS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_IT_CALORIES          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_IT_KILOCALORIES      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_JOULES               "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_KILOJOULES           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_KILOWATT_HOURS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>"
-    IDS_ENERGY_NUTRITION_CALORIES   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_TH_CALORIES          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
+    IDS_ENERGY_ERGS                 "Ergs"
+    IDS_ENERGY_IT_CALORIES          "International Table calories"
+    IDS_ENERGY_JOULES               "Joules"
+    IDS_ENERGY_KILOJOULES           "Kilojoules"
+    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
+    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calories"
+    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie"
 END
 
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_BARLEYCORNS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CENTIMETERS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CHAINS_UK            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_CHI                  "<EFBFBD><EFBFBD>"
-    IDS_LENGTH_CHOU                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CHR                  "<EFBFBD><EFBFBD>"
-    IDS_LENGTH_CUN                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FATHOMS              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FATHOMS_HUNGARY      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_FEET                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FURLONGS             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_GAN                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_HANDS                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_HUNH                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_INCHES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_JA                   "<EFBFBD>"
-    IDS_LENGTH_JEONG                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_KABIET               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_KEN                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_KEUB                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_KILOMETERS           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_LAR                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_LIGHT_YEARS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_LENGTH_LINKS_UK             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_METERS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MICRONS              "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MILES                "<22><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MILLIMETERS          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_NAUTICAL_MILES       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_NIEU                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_PARSECS              "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_PICAS                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_RI_JAPAN             "<EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_RI_KOREA             "<22><> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_RODS                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_SAWK                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_SEN                  "<22><><EFBFBD>"
-    IDS_LENGTH_SHAKU                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_SPAN                 "<22><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_SUN                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_TSUEN                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_VA                   "<EFBFBD><EFBFBD>"
-    IDS_LENGTH_YARDS                "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_YOTE                 "<22><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_ZHANG                "<22><><EFBFBD><EFBFBD>"
+    IDS_LENGTH_ANGSTROMS            "Angstroms"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomila units"
+    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
+    IDS_LENGTH_CENTIMETERS          "Centimeters"
+    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
+    IDS_LENGTH_CHI                  "Chi"
+    IDS_LENGTH_CHOU                 "Chou"
+    IDS_LENGTH_CHR                  "Chr"
+    IDS_LENGTH_CUN                  "Cun"
+    IDS_LENGTH_FATHOMS              "Fathoms"
+    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Hungary)"
+    IDS_LENGTH_FEET                 "Feet"
+    IDS_LENGTH_FURLONGS             "Furlongs"
+    IDS_LENGTH_GAN                  "Gan"
+    IDS_LENGTH_HANDS                "Hands"
+    IDS_LENGTH_HUNH                 "Hunh"
+    IDS_LENGTH_INCHES               "Inches"
+    IDS_LENGTH_JA                   "Ja"
+    IDS_LENGTH_JEONG                "Jeong"
+    IDS_LENGTH_KABIET               "Kabiet"
+    IDS_LENGTH_KEN                  "Ken"
+    IDS_LENGTH_KEUB                 "Keub"
+    IDS_LENGTH_KILOMETERS           "Kilometers"
+    IDS_LENGTH_LAR                  "Lar"
+    IDS_LENGTH_LIGHT_YEARS          "Light years"
+    IDS_LENGTH_LINKS_UK             "Links (UK)"
+    IDS_LENGTH_METERS               "Meters"
+    IDS_LENGTH_MILES                "Miles"
+    IDS_LENGTH_MILLIMETERS          "Millimeters"
+    IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
+    IDS_LENGTH_NIEU                 "Nieu"
+    IDS_LENGTH_PARSECS              "Parsecs"
+    IDS_LENGTH_PICAS                "Picas"
+    IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
+    IDS_LENGTH_RI_KOREA             "Ri (Korea)"
+    IDS_LENGTH_SAWK                 "Sawk"
+    IDS_LENGTH_SEN                  "Sen"
+    IDS_LENGTH_SHAKU                "Shaku"
+    IDS_LENGTH_SPAN                 "Span"
+    IDS_LENGTH_SUN                  "Sun"
+    IDS_LENGTH_TSUEN                "Tsuen"
+    IDS_LENGTH_VA                   "Va"
+    IDS_LENGTH_YARDS                "Yards"
+    IDS_LENGTH_YOTE                 "Yote"
+    IDS_LENGTH_ZHANG                "Zhang"
 END
 
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_FPS_PER_MINUTE        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_HORSEPOWER            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_POWER_KILOWATTS             "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_MEGAWATTS             "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_WATTS                 "<22><><EFBFBD><EFBFBD>"
+    IDS_POWER_HORSEPOWER            "Horsepower"
+    IDS_POWER_KILOWATTS             "Kilowatts"
+    IDS_POWER_MEGAWATTS             "Megawatts"
+    IDS_POWER_WATTS                 "Watts"
 END
 
 // TYPE OF PRESSURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_PRESSURE_BARS               "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_HECTOPASCALS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_KILOPASCALS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_MM_OF_MERCURY      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_PASCALS            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_PSI                "<22><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
+    IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
+    IDS_PRESSURE_BARS               "Bars"
+    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
+    IDS_PRESSURE_PASCALS            "Pascals"
+    IDS_PRESSURE_PSI                "Pounds-force per square inch"
 END
 
 // TYPES OF TEMPERATURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_TEMPERATURE_CELSIUS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_TEMPERATURE_FAHRENHEIT      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_TEMPERATURE_KELVIN          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_TEMPERATURE_RANKINE         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD> Rankine)"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "<22><><EFBFBD><EFBFBD>"
-    IDS_TIME_HOURS        "<22><><EFBFBD>"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_MILLISECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_MINUTES      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_SECONDS      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_WEEKS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_YEARS        "<22><><EFBFBD>"
+    IDS_TEMPERATURE_CELSIUS         "Celsius"
+    IDS_TEMPERATURE_FAHRENHEIT      "Fahrenheit"
+    IDS_TEMPERATURE_KELVIN          "Kelvin"
+    IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD>"
-    IDS_VELOCITY_FEET_HOUR          "<22><><EFBFBD> <20> <20><><EFBFBD>"
-    IDS_VELOCITY_FEET_SECOND        "<22><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_KILOMETERS_HOUR    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD>"
-    IDS_VELOCITY_KNOTS              "<22><><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_MACH               "<22><><EFBFBD>"
-    IDS_VELOCITY_METERS_SECOND      "<22><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_MILES_HOUR         "<22><><EFBFBD><EFBFBD> <20> <20><><EFBFBD>"
+    IDS_VELOCITY_FEET_HOUR          "Feet/hour"
+    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
+    IDS_VELOCITY_KNOTS              "Knots"
+    IDS_VELOCITY_MACH               "Mach"
+    IDS_VELOCITY_METERS_SECOND      "Meters/second"
+    IDS_VELOCITY_MILES_HOUR         "Miles/hour"
 END
 
 // TYPES OF VOLUMES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_BARRELS_OIL          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_BUN                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_BUSHELS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_BUSHELS_US           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_FEET           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_VOLUME_CUBIC_INCHES         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_METERS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_YARDS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_VOLUME_DOE                  "<EFBFBD><EFBFBD>"
-    IDS_VOLUME_FLUID_OUNCES_UK      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_FLUID_OUNCES_US      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_GALLONS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_GALLONS_DRY_US       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_GOU                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_HOP                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_ICCE                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_KWIAN                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_LITERS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_MAL                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_MILLILITERS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_PINTS_UK             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_PINTS_DRY_US         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_PINTS_LIQUID_US      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_QUARTS_UK            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_QUARTS_DRY_US        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_SEKI                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_SYOU                 "<EFBFBD><EFBFBD>"
-    IDS_VOLUME_TANANLOUNG           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_TANG                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_TO                   "<EFBFBD><EFBFBD>"
+    IDS_VOLUME_BARRELS_UK           "Barrels (UK)"
+    IDS_VOLUME_BARRELS_OIL          "Barrels oil"
+    IDS_VOLUME_BUN                  "Bun"
+    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
+    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
+    IDS_VOLUME_CUBIC_CENTIMETERS    "Cubic centimeters"
+    IDS_VOLUME_CUBIC_FEET           "Cubic feet"
+    IDS_VOLUME_CUBIC_INCHES         "Cubic inches"
+    IDS_VOLUME_CUBIC_METERS         "Cubic meters"
+    IDS_VOLUME_CUBIC_YARDS          "Cubic yards"
+    IDS_VOLUME_DOE                  "Doe"
+    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
+    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
+    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
+    IDS_VOLUME_GALLONS_DRY_US       "Gallons, dry (US)"
+    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liquid (US)"
+    IDS_VOLUME_GOU                  "Gou"
+    IDS_VOLUME_HOP                  "Hop"
+    IDS_VOLUME_ICCE                 "Icce"
+    IDS_VOLUME_KWIAN                "Kwian"
+    IDS_VOLUME_LITERS               "Liters"
+    IDS_VOLUME_MAL                  "Mal"
+    IDS_VOLUME_MILLILITERS          "Milliliters"
+    IDS_VOLUME_PINTS_UK             "Pints (UK)"
+    IDS_VOLUME_PINTS_DRY_US         "Pints, dry (US)"
+    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquid (US)"
+    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
+    IDS_VOLUME_QUARTS_DRY_US        "Quarts, dry (US)"
+    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquid (US)"
+    IDS_VOLUME_SEKI                 "Seki"
+    IDS_VOLUME_SYOU                 "Syou"
+    IDS_VOLUME_TANANLOUNG           "Tananloung"
+    IDS_VOLUME_TANG                 "Tang"
+    IDS_VOLUME_TO                   "To"
 END
 
 // TYPES OF WEIGHTS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_WEIGHT_BAHT                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_CARATS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_CHUNG                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_DON                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_GEUN                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_GRAMS                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_GWAN                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_HARB                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_JIN_CHINA            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_JIN_TAIWAN           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_KAN                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_KILOGRAMS            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_KIN                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_LIANG_CHINA          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_LIANG_TAIWAN         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_MONME                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_OUNCES_TROY          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_POUNDS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_QUINTAL_METRIC       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_SALOUNG              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_STONES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_TAMLUNG              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_TONNES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_TONS_UK              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_TONS_US              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
+    IDS_WEIGHT_BAHT                 "Baht"
+    IDS_WEIGHT_CARATS               "Carats"
+    IDS_WEIGHT_CHUNG                "Chung"
+    IDS_WEIGHT_DON                  "Don"
+    IDS_WEIGHT_GEUN                 "Geun"
+    IDS_WEIGHT_GRAMS                "Grams"
+    IDS_WEIGHT_GWAN                 "Gwan"
+    IDS_WEIGHT_HARB                 "Harb"
+    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
+    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
+    IDS_WEIGHT_KAN                  "Kan"
+    IDS_WEIGHT_KILOGRAMS            "Kilograms"
+    IDS_WEIGHT_KIN                  "Kin"
+    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
+    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
+    IDS_WEIGHT_MONME                "Monme"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
+    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
+    IDS_WEIGHT_POUNDS               "Pounds"
+    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
+    IDS_WEIGHT_SALOUNG              "Saloung"
+    IDS_WEIGHT_STONES               "Stones"
+    IDS_WEIGHT_TAMLUNG              "Tamlung"
+    IDS_WEIGHT_TONNES               "Tonnes"
+    IDS_WEIGHT_TONS_UK              "Tons (UK)"
+    IDS_WEIGHT_TONS_US              "Tons (US)"
 END

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

@@ -1,9 +1,10 @@
 /* TRANSLATOR :  M<>rio Ka<4B>m<EFBFBD>r /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.:  30-01-2008
- * LAST CHANGE:  04-09-2009
+ * LAST CHANGE:  10-07-2008 
  * ---------------------------------------
  * TODO:
- * pridanie naviga<67>n<EFBFBD>ch zna<6E>iek "&" ?
+ * 1. treba usporiada<64> jednotky pod<6F>a abecedy
+ * 2. pridanie naviga<67>n<EFBFBD>ch zna<6E>iek "&"
  */
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
@@ -17,10 +18,14 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -234,7 +239,7 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kalkula<6C>ka syst<73>mu ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
@@ -345,6 +350,7 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -439,35 +445,25 @@ END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_STRING_LICENSE      "Kalkula<6C>ka syst<73>mu ReactOS je vo<76>n<EFBFBD> softv<74>r vydan<61> pod licenciou GNU GPL.\r\n\r\nK<6E>piu licencie GNU GPL m<><6D>ete z<>ska<6B> tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako m<><6D>ete z<>ska<6B> preklad licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html"
+    IDS_STRING_LICENSE      "Kalkula<6C>ka syst<73>mu ReactOS je vo<76>n<EFBFBD> softv<74>r vydan<61> pod licenciou GNU GPL.\r\n\r\nK<6E>piu licenie GNU GPL m<><6D>ete z<>ska<6B> tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako m<><6D>ete z<>ska<6B> preklad licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR          "Chyba"
     IDS_QUICKHELP           "R<>chla pomoc"
 END
 
-// Types of conversion
+// types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "Uhol"
-    IDS_CONV_AREA           "Plocha"
-    IDS_CONV_CONSUMPTION    "Spotreba motorov" //Spotreba (motory)
-    IDS_CONV_CURRENCY       "Mena"
-    IDS_CONV_ENERGY         "Energia"
     IDS_CONV_LENGTH         "D<><44>ka"
-    IDS_CONV_POWER          "V<EFBFBD>kon"
-    IDS_CONV_PRESSURE       "Tlak"
-    IDS_CONV_TEMPERATURE    "Teplota"
-    IDS_CONV_TIME           "<22>as"
-    IDS_CONV_VELOCITY       "R<>chlos<6F>"
-    IDS_CONV_VOLUME         "Objem"
+    IDS_CONV_ENERGY         "Energia"
     IDS_CONV_WEIGHT         "Hmotnos<6F>"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES  "Stupne"
-    IDS_ANGLE_GRADIANS "Grady"
-    IDS_ANGLE_RADIANS  "Radi<64>ny"
+    IDS_CONV_CURRENCY       "Mena"
+    IDS_CONV_VOLUME         "Objem"
+    IDS_CONV_AREA           "Plocha"
+    IDS_CONV_VELOCITY       "R<>chlos<6F>"
+    IDS_CONV_CONSUMPTION    "Spotreba motorov" //Spotreba (motory)
+    IDS_CONV_TEMPERATURE    "Teplota"
+    IDS_CONV_PRESSURE       "Tlak"
+    IDS_CONV_POWER          "V<>kon"
 END
 
 // TYPES OF AREAS
@@ -521,22 +517,20 @@ END
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Rak<61>sky <20>iling"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Rak<61>zsky <20>iling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgick<63> frank"
-    IDS_CURRENCY_CYPRIOT_POUND      "Cypersk<EFBFBD> libra"
-    IDS_CURRENCY_CZECH_KORUNA       "<22>esk<73> koruna"
+    IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
     IDS_CURRENCY_DEUTSCHE_MARK      "Nemeck<63> marka"
     IDS_CURRENCY_DUTCH_GUILDER      "Holandsk<73> gulden"
     IDS_CURRENCY_EURO               "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA     "F<EFBFBD>nska marka"
+    IDS_CURRENCY_FINNISH_MARKKA     "Finsk<EFBFBD> marka"
     IDS_CURRENCY_FRENCH_FRANC       "Franc<6E>zsky frank"
     IDS_CURRENCY_GREEK_DRACHMA      "Gr<47>cka drachma"
-    IDS_CURRENCY_IRISH_POUND        "<EFBFBD>rska libra"
-    IDS_CURRENCY_ITALIAN_LIRA       "Taliansk<EFBFBD> l<EFBFBD>ra"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxembursk<EFBFBD> frank"
-    IDS_CURRENCY_MALTESE_LIRA       "Maltsk<EFBFBD> l<EFBFBD>ra"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portugalsk<EFBFBD> escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slovensk<73> koruna"
+    IDS_CURRENCY_IRISH_POUND        "Irish pound"
+    IDS_CURRENCY_ITALIAN_LIRA       "Italian lira"
+    IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxembourg franc"
+    IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovinsk<73> toliar"
     IDS_CURRENCY_SPANISH_PESETA     "<22>panielska peseta"
 END
@@ -544,13 +538,9 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <EFBFBD>C calories"
-    IDS_ENERGY_BTUS                 "British Thermal Units"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
     IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Electron-Volts"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
     IDS_ENERGY_IT_CALORIES          "International Table calories"
-    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
     IDS_ENERGY_JOULES               "Joules"
     IDS_ENERGY_KILOJOULES           "Kilojoules"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowatthodiny"
@@ -562,7 +552,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_LENGTH_ANGSTROMS            "Angstroms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomila units"
     IDS_LENGTH_BARLEYCORNS          "Barleycorns"
     IDS_LENGTH_CENTIMETERS          "Centimetre"
     IDS_LENGTH_CHAINS_UK            "Chains (UK)"
@@ -588,7 +578,6 @@ BEGIN
     IDS_LENGTH_LIGHT_YEARS          "Sveteln<6C> roky"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Metre"
-    IDS_LENGTH_MICRONS              "Mikr<6B>ny"
     IDS_LENGTH_MILES                "M<>le"
     IDS_LENGTH_MILLIMETERS          "Milimetre"
     IDS_LENGTH_NAUTICAL_MILES       "N<>morn<72> m<>le"
@@ -597,7 +586,6 @@ BEGIN
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japonsko)"
     IDS_LENGTH_RI_KOREA             "Ri (K<>rea)"
-    IDS_LENGTH_RODS                 "Rods"
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
@@ -613,8 +601,6 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "Britsk<73> term<72>lne jednotky za min<69>tu"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds za min<69>tu"
     IDS_POWER_HORSEPOWER            "Ko<4B>sk<73> sily"
     IDS_POWER_KILOWATTS             "Kilowatty"
     IDS_POWER_MEGAWATTS             "Megawatty"
@@ -626,11 +612,9 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosf<73>ry"
     IDS_PRESSURE_BARS               "Bary"
-    IDS_PRESSURE_HECTOPASCALS       "Hektopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
     IDS_PRESSURE_PASCALS            "Pascals"
-    IDS_PRESSURE_PSI                "Libry na <20>tvorcov<6F> palec"
+    IDS_PRESSURE_PSI                "Pounds-force per square inch"
 END
 
 // TYPES OF TEMPERATURES
@@ -642,26 +626,10 @@ BEGIN
     IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Dni"
-    IDS_TIME_HOURS        "Hodiny"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Mikrosekundy"
-    IDS_TIME_MILLISECONDS "Milisekundy"
-    IDS_TIME_MINUTES      "Min<69>ty"
-    IDS_TIME_SECONDS      "Sekundy"
-    IDS_TIME_WEEKS        "T<><54>dne"
-    IDS_TIME_YEARS        "Roky"
-END
-
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimetre/hodinu"
     IDS_VELOCITY_FEET_HOUR          "Stopy/hodinu"
-    IDS_VELOCITY_FEET_SECOND        "Stopy/sekundu"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometre/hodinu"
     IDS_VELOCITY_KNOTS              "Knots"
     IDS_VELOCITY_MACH               "Mach"

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

@@ -1,737 +0,0 @@
-/*
- *  ReactOS Calc (Thai resource file)
- *  Last modified: 2009-02-02
- */
-
-LANGUAGE LANG_THAI, SUBLANG_DEFAULT
-
-// Dialog
-
-IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ͧ<EFBFBD>Դ<EFBFBD>Ţ ReactOS"
-MENU IDR_MENU_SCIENTIFIC_1
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "<22>Ժˡ",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "<22>Ժ",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Ỵ",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "<22>ͧ",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
-    GROUPBOX        "",IDC_STATIC,4,36,76,21
-    CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,8,44,26,10
-    CONTROL         "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,40,44,29,10
-    CTEXT           "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CTEXT           "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    GROUPBOX        "",IDC_STATIC,140,16,172,21
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,148,24,37,10
-    CONTROL         "<22>ͧ<EFBFBD><CDA7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | 
-                    NOT WS_VISIBLE,188,24,37,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,232,24,33,10
-    CONTROL         "亵<>",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE,272,24,30,10
-    CONTROL         "ͧ<><CDA7>",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24,
-                    42,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD>¹",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192,
-                    24,42,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¹",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON,
-                    236,24,44,10
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD>໫",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ʶҹ<CAB6>Ҿ<EFBFBD><D2BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    PUSHBUTTON      "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD>໫",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "<22>ҡ",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    CTEXT           "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    PUSHBUTTON      "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | 
-                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ͧ<EFBFBD>Դ<EFBFBD>Ţ ReactOS"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON      "Convert",IDC_BUTTON_CONVERT,35,105,76,17
-    COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Category:",IDC_STATIC,4,20,56,8
-    COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Convert from:",IDC_STATIC,4,49,56,8
-    COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP | CBS_SORT
-    LTEXT           "Convert to:",IDC_STATIC,4,76,56,8
-    CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
-    CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD>໫",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
-                    BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
-                    40,17
-    RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17
-    CONTROL         "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17
-    CONTROL         "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17
-    CONTROL         "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17
-    CONTROL         "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17
-    CONTROL         "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17
-    CONTROL         "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17
-    CONTROL         "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17
-    CONTROL         "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17
-    CONTROL         "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17
-    CONTROL         "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17
-    CONTROL         ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17
-    CONTROL         "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17
-    CONTROL         "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17
-    CONTROL         "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17
-    CONTROL         "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17
-    CONTROL         "<22>ҡ",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17
-    CONTROL         "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17
-    CONTROL         "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17
-    CONTROL         "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17
-    CTEXT           "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE,
-                    WS_EX_CLIENTEDGE
-    CONTROL         "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17
-    CONTROL         "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17
-    CONTROL         "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17
-    CONTROL         "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | 
-                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17
-    DEFPUSHBUTTON   "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE
-END
-
-IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE  0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ǡѺ ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON   "<22><>ŧ",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           "<22><><EFBFBD><EFBFBD><EFBFBD>ͧ<EFBFBD>Դ<EFBFBD>Ţ ReactOS",IDC_STATIC,120,12,132,8,
-                    SS_CENTERIMAGE
-    LTEXT           "<22><><EFBFBD><EFBFBD> ",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,4,56,256,88
-    EDITTEXT        IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | 
-                    WS_VSCROLL
-END
-
-IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD>ͧʶҹ<CAB6>"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "RET",IDC_BUTTON_RET,4,48,36,16
-    PUSHBUTTON      "LOAD",IDC_BUTTON_LOAD,44,48,36,16
-    PUSHBUTTON      "CD",IDC_BUTTON_CD,84,48,36,16
-    PUSHBUTTON      "CAD",IDC_BUTTON_CAD,124,48,36,16
-    CTEXT           "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | 
-                    SS_SUNKEN
-END
-
-// Menus
-
-IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
-BEGIN
-    POPUP "<22>&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22>Ѵ<EFBFBD>͡\tCTRL-C",               IDM_EDIT_COPY
-        MENUITEM "<22>ҧ\tCTRL-V",                 IDM_EDIT_PASTE
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD>ͧ"
-    BEGIN
-        MENUITEM "Ẻ<>ҵðҹ",                  IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Ẻ<>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>",                IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¹<EFBFBD><C2B9>ŧ",               IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "<22>ҹ<EFBFBD>Ժˡ\tF5",                 IDM_VIEW_HEX, CHECKED
-        MENUITEM "<22>ҹ<EFBFBD>Ժ\tF6",                   IDM_VIEW_DEC, CHECKED
-        MENUITEM "<22>ҹỴ\tF7",                  IDM_VIEW_OCT, CHECKED
-        MENUITEM "<22>ҹ<EFBFBD>ͧ\tF8",                  IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "ͧ<><CDA7>\tF2",                    IDM_VIEW_DEG, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>¹\tF3",                  IDM_VIEW_RAD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¹\tF4",                 IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "<22>ʴ<EFBFBD><CAB4><EFBFBD>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD>Ţ",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>Ū<EFBFBD><C5AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>ǡѺ ReactOS Calc",         IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE 
-BEGIN
-    POPUP "<22>&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22>Ѵ<EFBFBD>͡\tCTRL-C",               IDM_EDIT_COPY
-        MENUITEM "<22>ҧ\tCTRL-V",                 IDM_EDIT_PASTE
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD>ͧ"
-    BEGIN
-        MENUITEM "Ẻ<>ҵðҹ",                  IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Ẻ<>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>",                IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¹<EFBFBD><C2B9>ŧ",               IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "<22>ҹ<EFBFBD>Ժˡ\tF5",                 IDM_VIEW_HEX, CHECKED
-        MENUITEM "<22>ҹ<EFBFBD>Ժ\tF6",                   IDM_VIEW_DEC, CHECKED
-        MENUITEM "<22>ҹỴ\tF7",                  IDM_VIEW_OCT, CHECKED
-        MENUITEM "<22>ҹ<EFBFBD>ͧ\tF8",                  IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "<22><>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF12",               IDM_VIEW_QWORD, CHECKED
-        MENUITEM "<22>Ѻ<EFBFBD><D1BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF2",               IDM_VIEW_DWORD, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF3",                    IDM_VIEW_WORD, CHECKED
-        MENUITEM "亵<>\tF4",                     IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "<22>ʴ<EFBFBD><CAB4><EFBFBD>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD>Ţ",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>Ū<EFBFBD><C5AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>ǡѺ ReactOS Calc",         IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU DISCARDABLE 
-BEGIN
-    POPUP "<22>&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22>Ѵ<EFBFBD>͡\tCTRL-C",               IDM_EDIT_COPY
-        MENUITEM "<22>ҧ\tCTRL-V",                 IDM_EDIT_PASTE
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD>ͧ"
-    BEGIN
-        MENUITEM "Ẻ<>ҵðҹ",                  IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Ẻ<>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>",                IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¹<EFBFBD><C2B9>ŧ",               IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "<22>ʴ<EFBFBD><CAB4><EFBFBD>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD>Ţ",                IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>Ū<EFBFBD><C5AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>ǡѺ ReactOS Calc",         IDM_HELP_ABOUT
-    END
-END
-
-// String Tables
-
-STRINGTABLE DISCARDABLE 
-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          "<22>Դ<EFBFBD><D4B4>Ҵ"
-    IDS_QUICKHELP           "<22><>觹<EFBFBD><E8A7B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?"
-END
-
-// types of conversion
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONV_ANGLE          "<22><><EFBFBD>"
-    IDS_CONV_AREA           "<22><>鹷<EFBFBD><E9B9B7>"
-    IDS_CONV_CONSUMPTION    "Consumption (engines)"
-    IDS_CONV_CURRENCY       "Currencies"
-    IDS_CONV_ENERGY         "Energy"
-    IDS_CONV_LENGTH         "Lenghts"
-    IDS_CONV_POWER          "Power"
-    IDS_CONV_PRESSURE       "Pressure"
-    IDS_CONV_TEMPERATURE    "Temperature"
-    IDS_CONV_TIME           "<22><><EFBFBD><EFBFBD>"
-    IDS_CONV_VELOCITY       "Velocity"
-    IDS_CONV_VOLUME         "Volume"
-    IDS_CONV_WEIGHT         "Weights"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "ͧ<><CDA7>"
-    IDS_ANGLE_GRADIANS      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¹"
-    IDS_ANGLE_RADIANS       "<22><><EFBFBD><EFBFBD><EFBFBD>¹"
-END
-
-// TYPES OF AREAS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_AREA_ACRES                  "Acres"
-    IDS_AREA_ACRES_BRAZIL           "Acres (Brazil)"
-    IDS_AREA_ACRES_FRANCE           "Acres (France)"
-    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
-    IDS_AREA_ACRES_US               "Acres (US)"
-    IDS_AREA_ARES                   "Ares"
-    IDS_AREA_CHOU                   "Chou"
-    IDS_AREA_DANBO                  "Danbo"
-    IDS_AREA_HECTARES               "Hectares"
-    IDS_AREA_JEONGBO                "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungary)"
-    IDS_AREA_MU                     "Mu"
-    IDS_AREA_PING                   "Ping"
-    IDS_AREA_PYEONG                 "Pyeong"
-    IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
-    IDS_AREA_RAI                    "Rai"
-    IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Square centimeters"
-    IDS_AREA_SQUARE_CHR             "Square chr"
-    IDS_AREA_SQUARE_FATHOMS         "Square fathoms"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
-    IDS_AREA_SQUARE_FEET            "Square feet"
-    IDS_AREA_SQUARE_INCHES          "Square inches"
-    IDS_AREA_SQUARE_KILOMETERS      "Square kilometers"
-    IDS_AREA_SQUARE_LAR             "Square lar"
-    IDS_AREA_SQUARE_METER           "Square meter"
-    IDS_AREA_SQUARE_MILES           "Square miles"
-    IDS_AREA_SQUARE_MILLIMETERS     "Square millimeters"
-    IDS_AREA_SQUARE_SHAKU           "Square shaku"
-    IDS_AREA_SQUARE_TSUEN           "Square tsuen"
-    IDS_AREA_SQUARE_VA              "Square va"
-    IDS_AREA_SQUARE_YARD            "Square yard"
-    IDS_AREA_TAN                    "Tan"
-    IDS_AREA_TSUBO                  "Tsubo"
-END
-
-// TYPES OF COMSUMPTIONS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
-    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometers"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
-END
-
-// TYPES OF CURRENCIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
-    IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
-    IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
-    IDS_CURRENCY_CZECH_KORUNA       "Czech koruna"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
-    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
-    IDS_CURRENCY_EURO               "<22><><EFBFBD><EFBFBD>"
-    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_LUXEMBOURG_FRANC   "Luxembourg franc"
-    IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Slovak koruna"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
-    IDS_CURRENCY_SPANISH_PESETA     "Spanish peseta"
-END
-
-// TYPES OF ENERGIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 ^0C <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_BTUS                 "British Thermal Units"
-    IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Electron-Volts"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
-    IDS_ENERGY_IT_CALORIES          "International Table calories"
-    IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
-    IDS_ENERGY_JOULES               "Joules"
-    IDS_ENERGY_KILOJOULES           "Kilojoules"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
-    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calories"
-    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie"
-END
-
-// TYPES OF LENGTHS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angstroms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Astronomical units"
-    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
-    IDS_LENGTH_CENTIMETERS          "Centimeters"
-    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
-    IDS_LENGTH_CHI                  "Chi"
-    IDS_LENGTH_CHOU                 "Chou"
-    IDS_LENGTH_CHR                  "Chr"
-    IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "Fathoms"
-    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Hungary)"
-    IDS_LENGTH_FEET                 "Feet"
-    IDS_LENGTH_FURLONGS             "Furlongs"
-    IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "Hands"
-    IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Inches"
-    IDS_LENGTH_JA                   "Ja"
-    IDS_LENGTH_JEONG                "Jeong"
-    IDS_LENGTH_KABIET               "Kabiet"
-    IDS_LENGTH_KEN                  "Ken"
-    IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "Kilometers"
-    IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Light years"
-    IDS_LENGTH_LINKS_UK             "Links (UK)"
-    IDS_LENGTH_METERS               "Meters"
-    IDS_LENGTH_MICRONS              "Microns"
-    IDS_LENGTH_MILES                "Miles"
-    IDS_LENGTH_MILLIMETERS          "Millimeters"
-    IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
-    IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parsecs"
-    IDS_LENGTH_PICAS                "Picas"
-    IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
-    IDS_LENGTH_RI_KOREA             "Ri (Korea)"
-    IDS_LENGTH_RODS                 "Rods"
-    IDS_LENGTH_SAWK                 "Sawk"
-    IDS_LENGTH_SEN                  "Sen"
-    IDS_LENGTH_SHAKU                "Shaku"
-    IDS_LENGTH_SPAN                 "Span"
-    IDS_LENGTH_SUN                  "Sun"
-    IDS_LENGTH_TSUEN                "Tsuen"
-    IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "Yards"
-    IDS_LENGTH_YOTE                 "Yote"
-    IDS_LENGTH_ZHANG                "Zhang"
-END
-
-// TYPES OF POWERS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
-    IDS_POWER_HORSEPOWER            "Horsepower"
-    IDS_POWER_KILOWATTS             "Kilowatts"
-    IDS_POWER_MEGAWATTS             "Megawatts"
-    IDS_POWER_WATTS                 "Watts"
-END
-
-// TYPE OF PRESSURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
-    IDS_PRESSURE_BARS               "Bars"
-    IDS_PRESSURE_HECTOPASCALS       "Hectopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
-    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
-    IDS_PRESSURE_PASCALS            "Pascals"
-    IDS_PRESSURE_PSI                "Pounds-force per square inch"
-END
-
-// TYPES OF TEMPERATURES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS         "Celsius"
-    IDS_TEMPERATURE_FAHRENHEIT      "Fahrenheit"
-    IDS_TEMPERATURE_KELVIN          "Kelvin"
-    IDS_TEMPERATURE_RANKINE         "Rankine"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "Days"
-    IDS_TIME_HOURS        "Hours"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "Microseconds"
-    IDS_TIME_MILLISECONDS "Milliseconds"
-    IDS_TIME_MINUTES      "Minutes"
-    IDS_TIME_SECONDS      "Seconds"
-    IDS_TIME_WEEKS        "Weeks"
-    IDS_TIME_YEARS        "Years"
-END
-
-// TYPES OF VELOCITIES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimeters/hour"
-    IDS_VELOCITY_FEET_HOUR          "Feet/hour"
-    IDS_VELOCITY_FEET_SECOND        "Feet/second"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
-    IDS_VELOCITY_KNOTS              "Knots"
-    IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "Meters/second"
-    IDS_VELOCITY_MILES_HOUR         "Miles/hour"
-END
-
-// TYPES OF VOLUMES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK           "Barrels (UK)"
-    IDS_VOLUME_BARRELS_OIL          "Barrels oil"
-    IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
-    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Cubic centimeters"
-    IDS_VOLUME_CUBIC_FEET           "Cubic feet"
-    IDS_VOLUME_CUBIC_INCHES         "Cubic inches"
-    IDS_VOLUME_CUBIC_METERS         "Cubic meters"
-    IDS_VOLUME_CUBIC_YARDS          "Cubic yards"
-    IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
-    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "Gallons, dry (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liquid (US)"
-    IDS_VOLUME_GOU                  "Gou"
-    IDS_VOLUME_HOP                  "Hop"
-    IDS_VOLUME_ICCE                 "Icce"
-    IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Liters"
-    IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Milliliters"
-    IDS_VOLUME_PINTS_UK             "Pints (UK)"
-    IDS_VOLUME_PINTS_DRY_US         "Pints, dry (US)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquid (US)"
-    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
-    IDS_VOLUME_QUARTS_DRY_US        "Quarts, dry (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquid (US)"
-    IDS_VOLUME_SEKI                 "Seki"
-    IDS_VOLUME_SYOU                 "Syou"
-    IDS_VOLUME_TANANLOUNG           "Tananloung"
-    IDS_VOLUME_TANG                 "Tang"
-    IDS_VOLUME_TO                   "To"
-END
-
-// TYPES OF WEIGHTS
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Carats"
-    IDS_WEIGHT_CHUNG                "Chung"
-    IDS_WEIGHT_DON                  "Don"
-    IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Grams"
-    IDS_WEIGHT_GWAN                 "Gwan"
-    IDS_WEIGHT_HARB                 "Harb"
-    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
-    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
-    IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilograms"
-    IDS_WEIGHT_KIN                  "Kin"
-    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
-    IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
-    IDS_WEIGHT_POUNDS               "Pounds"
-    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
-    IDS_WEIGHT_SALOUNG              "Saloung"
-    IDS_WEIGHT_STONES               "Stones"
-    IDS_WEIGHT_TAMLUNG              "Tamlung"
-    IDS_WEIGHT_TONNES               "Tonnes"
-    IDS_WEIGHT_TONS_UK              "Tons (UK)"
-    IDS_WEIGHT_TONS_US              "Tons (US)"
-END

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

@@ -1,9 +1,9 @@
 /*
  * PROJECT:     ReactOS Calculator
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/calc/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for ReactOS Calc
- * TRANSLATOR:  Artem Reznikov & Sakara Yevhen
+ * FILE:        rosapps/roscalc/lang/uk-UA.rc
+ * PURPOSE:     Ukraianian Language File for roscalc
+ * TRANSLATOR:  Artem Reznikov
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -17,10 +17,14 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "",IDC_STATIC,4,16,132,21
-    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10
-    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10
-    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10
-    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10
+    CONTROL         "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,
+                    10
+    CONTROL         "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,
+                    10
+    CONTROL         "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,
+                    10
+    CONTROL         "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,
+                    26,10
     GROUPBOX        "",IDC_STATIC,4,36,76,21
     CONTROL         "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,8,44,26,10
@@ -234,21 +238,21 @@ BEGIN
 END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS"
+STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    PUSHBUTTON      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_BUTTON_CONVERT,35,105,76,17
+    PUSHBUTTON      "Convert",IDC_BUTTON_CONVERT,35,105,76,17
     COMBOBOX        IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,4,20,56,8
+    LTEXT           "Category:",IDC_STATIC,4,20,56,8
     COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (\"<22>\"):",IDC_STATIC,4,49,56,8
+    LTEXT           "Convert from:",IDC_STATIC,4,49,56,8
     COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP | CBS_SORT
-    LTEXT           "ʳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (\"<22>\"):",IDC_STATIC,4,76,56,8
+    LTEXT           "Convert to:",IDC_STATIC,4,76,56,8
     CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
     CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
@@ -345,6 +349,7 @@ BEGIN
                     SS_SUNKEN
 END
 
+
 // Menus
 
 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE 
@@ -447,294 +452,256 @@ END
 // types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_ANGLE          "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_AREA           "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_CONSUMPTION    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_CONV_CURRENCY       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_ENERGY         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_LENGTH         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_POWER          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_PRESSURE       "<22><><EFBFBD><EFBFBD>"
-    IDS_CONV_TEMPERATURE    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_TIME           "<22><><EFBFBD>"
-    IDS_CONV_VELOCITY       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONV_VOLUME         "<22><>'<27><>"
-    IDS_CONV_WEIGHT         "<22><><EFBFBD><EFBFBD>"
-END
-
-// TYPES OF ANGLES
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ANGLE_DEGREES       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ANGLE_GRADIANS      "<22><><EFBFBD><EFBFBD>"
-    IDS_ANGLE_RADIANS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_CONV_AREA           "Area"
+    IDS_CONV_CONSUMPTION    "Consumption (engines)"
+    IDS_CONV_CURRENCY       "Currencies"
+    IDS_CONV_ENERGY         "Energy"
+    IDS_CONV_LENGTH         "Lenghts"
+    IDS_CONV_POWER          "Power"
+    IDS_CONV_PRESSURE       "Pressure"
+    IDS_CONV_TEMPERATURE    "Temperature"
+    IDS_CONV_VELOCITY       "Velocity"
+    IDS_CONV_VOLUME         "Volume"
+    IDS_CONV_WEIGHT         "Weights"
 END
 
 // TYPES OF AREAS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_AREA_ACRES                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_ACRES_BRAZIL           "<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_FRANCE           "<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_SCOTS            "<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_ACRES_US               "<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_AREA_ARES                   "<EFBFBD><EFBFBD>"
-    IDS_AREA_CHOU                   "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_DANBO                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_HECTARES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_JEONGBO                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_MORGEN_HUNGARY         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_MU                     "<EFBFBD><EFBFBD>"
-    IDS_AREA_PING                   "ϳ<EFBFBD><EFBFBD>"
-    IDS_AREA_PYEONG                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_PYEONGBANGJA           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_RAI                    "<EFBFBD><EFBFBD><EFBFBD>"
+    IDS_AREA_ACRES                  "Acres"
+    IDS_AREA_ACRES_BRAZIL           "Acres (Brazil)"
+    IDS_AREA_ACRES_FRANCE           "Acres (France)"
+    IDS_AREA_ACRES_SCOTS            "Acres (Scots)"
+    IDS_AREA_ACRES_US               "Acres (US)"
+    IDS_AREA_ARES                   "Ares"
+    IDS_AREA_CHOU                   "Chou"
+    IDS_AREA_DANBO                  "Danbo"
+    IDS_AREA_HECTARES               "Hectares"
+    IDS_AREA_JEONGBO                "Jeongbo"
+    IDS_AREA_MORGEN_HUNGARY         "Morgen (Hungary)"
+    IDS_AREA_MU                     "Mu"
+    IDS_AREA_PING                   "Ping"
+    IDS_AREA_PYEONG                 "Pyeong"
+    IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
+    IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_CHR             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>"
-    IDS_AREA_SQUARE_FATHOMS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_AREA_SQUARE_FEET            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_AREA_SQUARE_INCHES          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_KILOMETERS      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_LAR             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_AREA_SQUARE_METER           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_MILES           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_MILLIMETERS     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_SHAKU           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_TSUEN           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_SQUARE_VA              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>"
-    IDS_AREA_SQUARE_YARD            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_AREA_TAN                    "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_AREA_TSUBO                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_AREA_SQUARE_CENTIMETERS     "Square centimeters"
+    IDS_AREA_SQUARE_CHR             "Square chr"
+    IDS_AREA_SQUARE_FATHOMS         "Square fathoms"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)"
+    IDS_AREA_SQUARE_FEET            "Square feet"
+    IDS_AREA_SQUARE_INCHES          "Square inches"
+    IDS_AREA_SQUARE_KILOMETERS      "Square kilometers"
+    IDS_AREA_SQUARE_LAR             "Square lar"
+    IDS_AREA_SQUARE_METER           "Square meter"
+    IDS_AREA_SQUARE_MILES           "Square miles"
+    IDS_AREA_SQUARE_MILLIMETERS     "Square millimeters"
+    IDS_AREA_SQUARE_SHAKU           "Square shaku"
+    IDS_AREA_SQUARE_TSUEN           "Square tsuen"
+    IDS_AREA_SQUARE_VA              "Square va"
+    IDS_AREA_SQUARE_YARD            "Square yard"
+    IDS_AREA_TAN                    "Tan"
+    IDS_AREA_TSUBO                  "Tsubo"
 END
 
 // TYPES OF COMSUMPTIONS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "ʳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD>"
-    IDS_CONSUMPTION_L_PER_100_KM    "˳<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/100 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CONSUMPTION_MILES_GALLON_UK "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_CONSUMPTION_MILES_GALLON_US "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
+    IDS_CONSUMPTION_KM_PER_L        "Kilometer/liter"
+    IDS_CONSUMPTION_L_PER_100_KM    "Liters/100 kilometers"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)"
+    IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)"
 END
 
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_BELGIAN_FRANC      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_CYPRIOT_POUND      "ʳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_CZECH_KORUNA       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_DEUTSCHE_MARK      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_DUTCH_GUILDER      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_EURO               "<22><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_FINNISH_MARKKA     "Գ<><D4B3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_FRENCH_FRANC       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_GREEK_DRACHMA      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_IRISH_POUND        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_ITALIAN_LIRA       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_MALTESE_LIRA       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_SLOVAK_KORUNA      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_CURRENCY_SPANISH_PESETA     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
+    IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
+    IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
+    IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
+    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
+    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_LUXEMBOURG_FRANC   "Luxembourg franc"
+    IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
+    IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovenian tolar"
+    IDS_CURRENCY_SPANISH_PESETA     "Spanish peseta"
 END
 
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 15-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_BTUS                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_ERGS                 "<22><><EFBFBD>"
-    IDS_ENERGY_EVS                  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_FOOT_POUNDS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>"
-    IDS_ENERGY_IT_CALORIES          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_IT_KILOCALORIES      "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_JOULES               "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_KILOJOULES           "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_KILOWATT_HOURS       "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_NUTRITION_CALORIES   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ENERGY_TH_CALORIES          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_ENERGY_15_C_CALORIES        "15 ^C calories"
+    IDS_ENERGY_ERGS                 "Ergs"
+    IDS_ENERGY_IT_CALORIES          "International Table calories"
+    IDS_ENERGY_JOULES               "Joules"
+    IDS_ENERGY_KILOJOULES           "Kilojoules"
+    IDS_ENERGY_KILOWATT_HOURS       "Kilowatt hours"
+    IDS_ENERGY_NUTRITION_CALORIES   "Nutrition calories"
+    IDS_ENERGY_TH_CALORIES          "Thermochemical calorie"
 END
 
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_BARLEYCORNS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CENTIMETERS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CHAINS_UK            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_CHI                  "׳"
-    IDS_LENGTH_CHOU                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_CHR                  "<EFBFBD><EFBFBD>"
-    IDS_LENGTH_CUN                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FATHOMS              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FATHOMS_HUNGARY      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_FEET                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_FURLONGS             "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_GAN                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_HANDS                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_HUNH                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_INCHES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_JA                   "<EFBFBD>"
-    IDS_LENGTH_JEONG                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_KABIET               "<EFBFBD><EFBFBD>ᒺ<EFBFBD>"
-    IDS_LENGTH_KEN                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_KEUB                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_KILOMETERS           "ʳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_LAR                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_LIGHT_YEARS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_LENGTH_LINKS_UK             "˳<EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_METERS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MICRONS              "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MILES                "<22><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_MILLIMETERS          "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_NAUTICAL_MILES       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_NIEU                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_PARSECS              "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_PICAS                "ϳ<><CFB3>"
-    IDS_LENGTH_RI_JAPAN             "г (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_RI_KOREA             "г (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_LENGTH_RODS                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_SAWK                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_SEN                  "<22><><EFBFBD>"
-    IDS_LENGTH_SHAKU                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_SPAN                 "<22><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_SUN                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_TSUEN                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_VA                   "<EFBFBD><EFBFBD>"
-    IDS_LENGTH_YARDS                "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_LENGTH_YOTE                 "<22><><EFBFBD><EFBFBD>"
-    IDS_LENGTH_ZHANG                "<22><><EFBFBD><EFBFBD>"
+    IDS_LENGTH_ANGSTROMS            "Angstroms"
+    IDS_LENGTH_ASTRONOMILA_UNITS    "Astronomila units"
+    IDS_LENGTH_BARLEYCORNS          "Barleycorns"
+    IDS_LENGTH_CENTIMETERS          "Centimeters"
+    IDS_LENGTH_CHAINS_UK            "Chains (UK)"
+    IDS_LENGTH_CHI                  "Chi"
+    IDS_LENGTH_CHOU                 "Chou"
+    IDS_LENGTH_CHR                  "Chr"
+    IDS_LENGTH_CUN                  "Cun"
+    IDS_LENGTH_FATHOMS              "Fathoms"
+    IDS_LENGTH_FATHOMS_HUNGARY      "Fathoms (Hungary)"
+    IDS_LENGTH_FEET                 "Feet"
+    IDS_LENGTH_FURLONGS             "Furlongs"
+    IDS_LENGTH_GAN                  "Gan"
+    IDS_LENGTH_HANDS                "Hands"
+    IDS_LENGTH_HUNH                 "Hunh"
+    IDS_LENGTH_INCHES               "Inches"
+    IDS_LENGTH_JA                   "Ja"
+    IDS_LENGTH_JEONG                "Jeong"
+    IDS_LENGTH_KABIET               "Kabiet"
+    IDS_LENGTH_KEN                  "Ken"
+    IDS_LENGTH_KEUB                 "Keub"
+    IDS_LENGTH_KILOMETERS           "Kilometers"
+    IDS_LENGTH_LAR                  "Lar"
+    IDS_LENGTH_LIGHT_YEARS          "Light years"
+    IDS_LENGTH_LINKS_UK             "Links (UK)"
+    IDS_LENGTH_METERS               "Meters"
+    IDS_LENGTH_MILES                "Miles"
+    IDS_LENGTH_MILLIMETERS          "Millimeters"
+    IDS_LENGTH_NAUTICAL_MILES       "Nautical miles"
+    IDS_LENGTH_NIEU                 "Nieu"
+    IDS_LENGTH_PARSECS              "Parsecs"
+    IDS_LENGTH_PICAS                "Picas"
+    IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
+    IDS_LENGTH_RI_KOREA             "Ri (Korea)"
+    IDS_LENGTH_SAWK                 "Sawk"
+    IDS_LENGTH_SEN                  "Sen"
+    IDS_LENGTH_SHAKU                "Shaku"
+    IDS_LENGTH_SPAN                 "Span"
+    IDS_LENGTH_SUN                  "Sun"
+    IDS_LENGTH_TSUEN                "Tsuen"
+    IDS_LENGTH_VA                   "Va"
+    IDS_LENGTH_YARDS                "Yards"
+    IDS_LENGTH_YOTE                 "Yote"
+    IDS_LENGTH_ZHANG                "Zhang"
 END
 
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_FPS_PER_MINUTE        "<22><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_HORSEPOWER            "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_POWER_KILOWATTS             "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_MEGAWATTS             "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_POWER_WATTS                 "<22><><EFBFBD>"
+    IDS_POWER_HORSEPOWER            "Horsepower"
+    IDS_POWER_KILOWATTS             "Kilowatts"
+    IDS_POWER_MEGAWATTS             "Megawatts"
+    IDS_POWER_WATTS                 "Watts"
 END
 
 // TYPE OF PRESSURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Գ<><D4B3><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_PRESSURE_BARS               "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_HECTOPASCALS       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_KILOPASCALS        "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_MM_OF_MERCURY      "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_PASCALS            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_PRESSURE_PSI                "<22><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
+    IDS_PRESSURE_ATMOSPHERES        "Atmospheres"
+    IDS_PRESSURE_BARS               "Bars"
+    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
+    IDS_PRESSURE_PASCALS            "Pascals"
+    IDS_PRESSURE_PSI                "Pounds-force per square inch"
 END
 
 // TYPES OF TEMPERATURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_TEMPERATURE_CELSIUS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_TEMPERATURE_FAHRENHEIT      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_TEMPERATURE_KELVIN          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_TEMPERATURE_RANKINE         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-END
-
-// TYPES OF TIME
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TIME_DAYS         "<22><><EFBFBD><EFBFBD>"
-    IDS_TIME_HOURS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_NANOSECONDS  "Nanoseconds"
-    IDS_TIME_MICROSECONDS "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_MILLISECONDS "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_MINUTES      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_SECONDS      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_WEEKS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_TIME_YEARS        "г<>"
+    IDS_TEMPERATURE_CELSIUS         "Celsius"
+    IDS_TEMPERATURE_FAHRENHEIT      "Fahrenheit"
+    IDS_TEMPERATURE_KELVIN          "Kelvin"
+    IDS_TEMPERATURE_RANKINE         "Rankine"
 END
 
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_FEET_HOUR          "<22><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_FEET_SECOND        "<22><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_KILOMETERS_HOUR    "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_KNOTS              "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_MACH               "<22><><EFBFBD>"
-    IDS_VELOCITY_METERS_SECOND      "<22><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VELOCITY_MILES_HOUR         "<22><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_VELOCITY_FEET_HOUR          "Feet/hour"
+    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometers/hour"
+    IDS_VELOCITY_KNOTS              "Knots"
+    IDS_VELOCITY_MACH               "Mach"
+    IDS_VELOCITY_METERS_SECOND      "Meters/second"
+    IDS_VELOCITY_MILES_HOUR         "Miles/hour"
 END
 
 // TYPES OF VOLUMES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_BARRELS_OIL          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_BUN                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_BUSHELS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_BUSHELS_US           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_FEET           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_VOLUME_CUBIC_INCHES         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_METERS         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_VOLUME_CUBIC_YARDS          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>"
-    IDS_VOLUME_DOE                  "<EFBFBD><EFBFBD>"
-    IDS_VOLUME_FLUID_OUNCES_UK      "г<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_FLUID_OUNCES_US      "г<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
-    IDS_VOLUME_GALLONS_UK           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_GALLONS_DRY_US       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_GOU                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_HOP                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_ICCE                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_KWIAN                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_LITERS               "˳<EFBFBD><EFBFBD>"
-    IDS_VOLUME_MAL                  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_MILLILITERS          "̳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_PINTS_UK             "ϳ<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_PINTS_DRY_US         "ϳ<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_PINTS_LIQUID_US      "ϳ<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_QUARTS_UK            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_VOLUME_QUARTS_DRY_US        "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>)"
-    IDS_VOLUME_SEKI                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_SYOU                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_TANANLOUNG           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_TANG                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_VOLUME_TO                   "<EFBFBD><EFBFBD>"
+    IDS_VOLUME_BARRELS_UK           "Barrels (UK)"
+    IDS_VOLUME_BARRELS_OIL          "Barrels oil"
+    IDS_VOLUME_BUN                  "Bun"
+    IDS_VOLUME_BUSHELS_UK           "Bushels (UK)"
+    IDS_VOLUME_BUSHELS_US           "Bushels (US)"
+    IDS_VOLUME_CUBIC_CENTIMETERS    "Cubic centimeters"
+    IDS_VOLUME_CUBIC_FEET           "Cubic feet"
+    IDS_VOLUME_CUBIC_INCHES         "Cubic inches"
+    IDS_VOLUME_CUBIC_METERS         "Cubic meters"
+    IDS_VOLUME_CUBIC_YARDS          "Cubic yards"
+    IDS_VOLUME_DOE                  "Doe"
+    IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
+    IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (US)"
+    IDS_VOLUME_GALLONS_UK           "Gallons (UK)"
+    IDS_VOLUME_GALLONS_DRY_US       "Gallons, dry (US)"
+    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, liquid (US)"
+    IDS_VOLUME_GOU                  "Gou"
+    IDS_VOLUME_HOP                  "Hop"
+    IDS_VOLUME_ICCE                 "Icce"
+    IDS_VOLUME_KWIAN                "Kwian"
+    IDS_VOLUME_LITERS               "Liters"
+    IDS_VOLUME_MAL                  "Mal"
+    IDS_VOLUME_MILLILITERS          "Milliliters"
+    IDS_VOLUME_PINTS_UK             "Pints (UK)"
+    IDS_VOLUME_PINTS_DRY_US         "Pints, dry (US)"
+    IDS_VOLUME_PINTS_LIQUID_US      "Pints, liquid (US)"
+    IDS_VOLUME_QUARTS_UK            "Quarts (UK)"
+    IDS_VOLUME_QUARTS_DRY_US        "Quarts, dry (US)"
+    IDS_VOLUME_QUARTS_LIQUID_US     "Quarts, liquid (US)"
+    IDS_VOLUME_SEKI                 "Seki"
+    IDS_VOLUME_SYOU                 "Syou"
+    IDS_VOLUME_TANANLOUNG           "Tananloung"
+    IDS_VOLUME_TANG                 "Tang"
+    IDS_VOLUME_TO                   "To"
 END
 
 // TYPES OF WEIGHTS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_WEIGHT_BAHT                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_CARATS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_CHUNG                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_DON                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_GEUN                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_GRAMS                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_GWAN                 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_HARB                 "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_JIN_CHINA            "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_JIN_TAIWAN           "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_KAN                  "<EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_KILOGRAMS            "ʳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_KIN                  "ʳ<EFBFBD>"
-    IDS_WEIGHT_LIANG_CHINA          "˳<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_LIANG_TAIWAN         "˳<EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_MONME                "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_OUNCES_TROY          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_POUNDS               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_QUINTAL_METRIC       "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_SALOUNG              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_STONES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_TAMLUNG              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_TONNES               "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WEIGHT_TONS_UK              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_WEIGHT_TONS_US              "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)"
+    IDS_WEIGHT_BAHT                 "Baht"
+    IDS_WEIGHT_CARATS               "Carats"
+    IDS_WEIGHT_CHUNG                "Chung"
+    IDS_WEIGHT_DON                  "Don"
+    IDS_WEIGHT_GEUN                 "Geun"
+    IDS_WEIGHT_GRAMS                "Grams"
+    IDS_WEIGHT_GWAN                 "Gwan"
+    IDS_WEIGHT_HARB                 "Harb"
+    IDS_WEIGHT_JIN_CHINA            "Jin (China)"
+    IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
+    IDS_WEIGHT_KAN                  "Kan"
+    IDS_WEIGHT_KILOGRAMS            "Kilograms"
+    IDS_WEIGHT_KIN                  "Kin"
+    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
+    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
+    IDS_WEIGHT_MONME                "Monme"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Ounces, avoirdupois"
+    IDS_WEIGHT_OUNCES_TROY          "Ounces, troy"
+    IDS_WEIGHT_POUNDS               "Pounds"
+    IDS_WEIGHT_QUINTAL_METRIC       "Quintal (metric)"
+    IDS_WEIGHT_SALOUNG              "Saloung"
+    IDS_WEIGHT_STONES               "Stones"
+    IDS_WEIGHT_TAMLUNG              "Tamlung"
+    IDS_WEIGHT_TONNES               "Tonnes"
+    IDS_WEIGHT_TONS_UK              "Tons (UK)"
+    IDS_WEIGHT_TONS_US              "Tons (US)"
 END

base/applications/calc/resource.h

@@ -104,257 +104,225 @@
 #define IDC_BUTTON_RSH                  1093
 
 /* TYPES OF CONVERSIONS */
-#define IDS_CONV_ANGLE                  2000
-#define IDS_CONV_AREA                   2001
-#define IDS_CONV_CONSUMPTION            2002
-#define IDS_CONV_CURRENCY               2003
-#define IDS_CONV_ENERGY                 2004
-#define IDS_CONV_LENGTH                 2005
-#define IDS_CONV_POWER                  2006
-#define IDS_CONV_PRESSURE               2007
-#define IDS_CONV_TEMPERATURE            2008
-#define IDS_CONV_TIME                   2009
-#define IDS_CONV_VELOCITY               2010
-#define IDS_CONV_VOLUME                 2011
-#define IDS_CONV_WEIGHT                 2012
-
-/* TYPES OF ANGLES */
-#define IDS_ANGLE_DEGREES               2100
-#define IDS_ANGLE_GRADIANS              2101
-#define IDS_ANGLE_RADIANS               2102
+#define IDS_CONV_AREA                   2000
+#define IDS_CONV_CONSUMPTION            2001
+#define IDS_CONV_CURRENCY               2002
+#define IDS_CONV_ENERGY                 2003
+#define IDS_CONV_LENGTH                 2004
+#define IDS_CONV_POWER                  2005
+#define IDS_CONV_PRESSURE               2006
+#define IDS_CONV_TEMPERATURE            2007
+#define IDS_CONV_VELOCITY               2008
+#define IDS_CONV_VOLUME                 2009
+#define IDS_CONV_WEIGHT                 2010
 
 /* TYPES OF AREAS */
-#define IDS_AREA_ACRES                  2200
-#define IDS_AREA_ACRES_BRAZIL           2201
-#define IDS_AREA_ACRES_FRANCE           2202
-#define IDS_AREA_ACRES_SCOTS            2203
-#define IDS_AREA_ACRES_US               2204
-#define IDS_AREA_ARES                   2205
-#define IDS_AREA_CHOU                   2206
-#define IDS_AREA_DANBO                  2207
-#define IDS_AREA_HECTARES               2208
-#define IDS_AREA_JEONGBO                2209
-#define IDS_AREA_MORGEN_HUNGARY         2210
-#define IDS_AREA_MU                     2211
-#define IDS_AREA_PING                   2212
-#define IDS_AREA_PYEONG                 2213
-#define IDS_AREA_PYEONGBANGJA           2214
-#define IDS_AREA_RAI                    2215
-#define IDS_AREA_SE                     2216
-#define IDS_AREA_SQUARE_CENTIMETERS     2217
-#define IDS_AREA_SQUARE_CHR             2218
-#define IDS_AREA_SQUARE_FATHOMS         2219
-#define IDS_AREA_SQUARE_FATHOMS_HUNGARY 2220
-#define IDS_AREA_SQUARE_FEET            2221
-#define IDS_AREA_SQUARE_INCHES          2222
-#define IDS_AREA_SQUARE_KILOMETERS      2223
-#define IDS_AREA_SQUARE_LAR             2224
-#define IDS_AREA_SQUARE_METER           2225
-#define IDS_AREA_SQUARE_MILES           2226
-#define IDS_AREA_SQUARE_MILLIMETERS     2227
-#define IDS_AREA_SQUARE_SHAKU           2228
-#define IDS_AREA_SQUARE_TSUEN           2229
-#define IDS_AREA_SQUARE_VA              2230
-#define IDS_AREA_SQUARE_YARD            2231
-#define IDS_AREA_TAN                    2232
-#define IDS_AREA_TSUBO                  2233
+#define IDS_AREA_ACRES                  2100
+#define IDS_AREA_ACRES_BRAZIL           2101
+#define IDS_AREA_ACRES_FRANCE           2102
+#define IDS_AREA_ACRES_SCOTS            2103
+#define IDS_AREA_ACRES_US               2104
+#define IDS_AREA_ARES                   2105
+#define IDS_AREA_CHOU                   2106
+#define IDS_AREA_DANBO                  2107
+#define IDS_AREA_HECTARES               2108
+#define IDS_AREA_JEONGBO                2109
+#define IDS_AREA_MORGEN_HUNGARY         2110
+#define IDS_AREA_MU                     2111
+#define IDS_AREA_PING                   2112
+#define IDS_AREA_PYEONG                 2113
+#define IDS_AREA_PYEONGBANGJA           2114
+#define IDS_AREA_RAI                    2115
+#define IDS_AREA_SE                     2116
+#define IDS_AREA_SQUARE_CENTIMETERS     2117
+#define IDS_AREA_SQUARE_CHR             2118
+#define IDS_AREA_SQUARE_FATHOMS         2119
+#define IDS_AREA_SQUARE_FATHOMS_HUNGARY 2120
+#define IDS_AREA_SQUARE_FEET            2121
+#define IDS_AREA_SQUARE_INCHES          2122
+#define IDS_AREA_SQUARE_KILOMETERS      2123
+#define IDS_AREA_SQUARE_LAR             2124
+#define IDS_AREA_SQUARE_METER           2125
+#define IDS_AREA_SQUARE_MILES           2126
+#define IDS_AREA_SQUARE_MILLIMETERS     2127
+#define IDS_AREA_SQUARE_SHAKU           2128
+#define IDS_AREA_SQUARE_TSUEN           2129
+#define IDS_AREA_SQUARE_VA              2130
+#define IDS_AREA_SQUARE_YARD            2131
+#define IDS_AREA_TAN                    2132
+#define IDS_AREA_TSUBO                  2133
 
 /* TYPES OF COMSUMPTIONS */
-#define IDS_CONSUMPTION_KM_PER_L        2300
-#define IDS_CONSUMPTION_L_PER_100_KM    2301
-#define IDS_CONSUMPTION_MILES_GALLON_UK 2302
-#define IDS_CONSUMPTION_MILES_GALLON_US 2303
+#define IDS_CONSUMPTION_KM_PER_L        2200
+#define IDS_CONSUMPTION_L_PER_100_KM    2201
+#define IDS_CONSUMPTION_MILES_GALLON_UK 2202
+#define IDS_CONSUMPTION_MILES_GALLON_US 2203
 
 /* TYPES OF CURRENCIES */
-#define IDS_CURRENCY_AUSTRIAN_SCHILLING 2400
-#define IDS_CURRENCY_BELGIAN_FRANC      2401
-#define IDS_CURRENCY_CYPRIOT_POUND      2402
-#define IDS_CURRENCY_CZECH_KORUNA       2403
-#define IDS_CURRENCY_DEUTSCHE_MARK      2404
-#define IDS_CURRENCY_DUTCH_GUILDER      2405
-#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
+#define IDS_CURRENCY_AUSTRIAN_SCHILLING 2300
+#define IDS_CURRENCY_BELGIAN_FRANC      2301
+#define IDS_CURRENCY_CYPRIOT_POUND      2302
+#define IDS_CURRENCY_DEUTSCHE_MARK      2303
+#define IDS_CURRENCY_DUTCH_GUILDER      2304
+#define IDS_CURRENCY_EURO               2305
+#define IDS_CURRENCY_FINNISH_MARKKA     2306
+#define IDS_CURRENCY_FRENCH_FRANC       2307
+#define IDS_CURRENCY_GREEK_DRACHMA      2308
+#define IDS_CURRENCY_IRISH_POUND        2309
+#define IDS_CURRENCY_ITALIAN_LIRA       2310
+#define IDS_CURRENCY_LUXEMBOURG_FRANC   2311
+#define IDS_CURRENCY_MALTESE_LIRA       2312
+#define IDS_CURRENCY_PORTOGUESE_ESCUDO  2313
+#define IDS_CURRENCY_SLOVENIAN_TOLAR    2314
+#define IDS_CURRENCY_SPANISH_PESETA     2315
 
 /* TYPES OF ENERGIES */
-#define IDS_ENERGY_15_C_CALORIES        2500
-#define IDS_ENERGY_BTUS                 2501
-#define IDS_ENERGY_ERGS                 2502
-#define IDS_ENERGY_EVS                  2503
-#define IDS_ENERGY_FOOT_POUNDS          2504
-#define IDS_ENERGY_IT_CALORIES          2505
-#define IDS_ENERGY_IT_KILOCALORIES      2506
-#define IDS_ENERGY_JOULES               2507
-#define IDS_ENERGY_KILOJOULES           2508
-#define IDS_ENERGY_KILOWATT_HOURS       2509
-#define IDS_ENERGY_NUTRITION_CALORIES   2510
-#define IDS_ENERGY_TH_CALORIES          2511
+#define IDS_ENERGY_15_C_CALORIES        2400
+#define IDS_ENERGY_ERGS                 2401
+#define IDS_ENERGY_IT_CALORIES          2402
+#define IDS_ENERGY_JOULES               2403
+#define IDS_ENERGY_KILOJOULES           2404
+#define IDS_ENERGY_KILOWATT_HOURS       2405
+#define IDS_ENERGY_NUTRITION_CALORIES   2406
+#define IDS_ENERGY_TH_CALORIES          2407
 
 /* TYPES OF LENGTHS */
-#define IDS_LENGTH_ANGSTROMS            2600
-#define IDS_LENGTH_ASTRONOMICAL_UNITS   2601
-#define IDS_LENGTH_BARLEYCORNS          2602
-#define IDS_LENGTH_CENTIMETERS          2603
-#define IDS_LENGTH_CHAINS_UK            2604
-#define IDS_LENGTH_CHI                  2605
-#define IDS_LENGTH_CHOU                 2606
-#define IDS_LENGTH_CHR                  2607
-#define IDS_LENGTH_CUN                  2608
-#define IDS_LENGTH_FATHOMS              2609
-#define IDS_LENGTH_FATHOMS_HUNGARY      2610
-#define IDS_LENGTH_FEET                 2611
-#define IDS_LENGTH_FURLONGS             2612
-#define IDS_LENGTH_GAN                  2613
-#define IDS_LENGTH_HANDS                2614
-#define IDS_LENGTH_HUNH                 2615
-#define IDS_LENGTH_INCHES               2616
-#define IDS_LENGTH_JA                   2617
-#define IDS_LENGTH_JEONG                2618
-#define IDS_LENGTH_KABIET               2619
-#define IDS_LENGTH_KEN                  2620
-#define IDS_LENGTH_KEUB                 2621
-#define IDS_LENGTH_KILOMETERS           2622
-#define IDS_LENGTH_LAR                  2623
-#define IDS_LENGTH_LIGHT_YEARS          2624
-#define IDS_LENGTH_LINKS_UK             2625
-#define IDS_LENGTH_METERS               2626
-#define IDS_LENGTH_MICRONS              2627
-#define IDS_LENGTH_MILES                2628
-#define IDS_LENGTH_MILLIMETERS          2629
-#define IDS_LENGTH_NAUTICAL_MILES       2630
-#define IDS_LENGTH_NIEU                 2631
-#define IDS_LENGTH_PARSECS              2632
-#define IDS_LENGTH_PICAS                2633
-#define IDS_LENGTH_RODS                 2634
-#define IDS_LENGTH_RI_JAPAN             2635
-#define IDS_LENGTH_RI_KOREA             2636
-#define IDS_LENGTH_SAWK                 2637
-#define IDS_LENGTH_SEN                  2638
-#define IDS_LENGTH_SHAKU                2639
-#define IDS_LENGTH_SPAN                 2640
-#define IDS_LENGTH_SUN                  2641
-#define IDS_LENGTH_TSUEN                2642
-#define IDS_LENGTH_VA                   2643
-#define IDS_LENGTH_YARDS                2644
-#define IDS_LENGTH_YOTE                 2645
-#define IDS_LENGTH_ZHANG                2646
+#define IDS_LENGTH_ANGSTROMS            2500
+#define IDS_LENGTH_ASTRONOMILA_UNITS    2501
+#define IDS_LENGTH_BARLEYCORNS          2502
+#define IDS_LENGTH_CENTIMETERS          2503
+#define IDS_LENGTH_CHAINS_UK            2504
+#define IDS_LENGTH_CHI                  2505
+#define IDS_LENGTH_CHOU                 2506
+#define IDS_LENGTH_CHR                  2507
+#define IDS_LENGTH_CUN                  2508
+#define IDS_LENGTH_FATHOMS              2509
+#define IDS_LENGTH_FATHOMS_HUNGARY      2510
+#define IDS_LENGTH_FEET                 2511
+#define IDS_LENGTH_FURLONGS             2512
+#define IDS_LENGTH_GAN                  2513
+#define IDS_LENGTH_HANDS                2514
+#define IDS_LENGTH_HUNH                 2515
+#define IDS_LENGTH_INCHES               2516
+#define IDS_LENGTH_JA                   2517
+#define IDS_LENGTH_JEONG                2518
+#define IDS_LENGTH_KABIET               2519
+#define IDS_LENGTH_KEN                  2520
+#define IDS_LENGTH_KEUB                 2521
+#define IDS_LENGTH_KILOMETERS           2522
+#define IDS_LENGTH_LAR                  2523
+#define IDS_LENGTH_LIGHT_YEARS          2524
+#define IDS_LENGTH_LINKS_UK             2525
+#define IDS_LENGTH_METERS               2526
+#define IDS_LENGTH_MILES                2527
+#define IDS_LENGTH_MILLIMETERS          2528
+#define IDS_LENGTH_NAUTICAL_MILES       2529
+#define IDS_LENGTH_NIEU                 2530
+#define IDS_LENGTH_PARSECS              2531
+#define IDS_LENGTH_PICAS                2532
+#define IDS_LENGTH_RI_JAPAN             2533
+#define IDS_LENGTH_RI_KOREA             2534
+#define IDS_LENGTH_SAWK                 2535
+#define IDS_LENGTH_SEN                  2536
+#define IDS_LENGTH_SHAKU                2537
+#define IDS_LENGTH_SPAN                 2538
+#define IDS_LENGTH_SUN                  2539
+#define IDS_LENGTH_TSUEN                2540
+#define IDS_LENGTH_VA                   2541
+#define IDS_LENGTH_YARDS                2542
+#define IDS_LENGTH_YOTE                 2543
+#define IDS_LENGTH_ZHANG                2544
 
 /* TYPES OF POWERS */
-#define IDS_POWER_BTUS_PER_MINUTE       2700
-#define IDS_POWER_FPS_PER_MINUTE        2701
-#define IDS_POWER_HORSEPOWER            2702
-#define IDS_POWER_KILOWATTS             2703
-#define IDS_POWER_MEGAWATTS             2704
-#define IDS_POWER_WATTS                 2705
+#define IDS_POWER_HORSEPOWER            2600
+#define IDS_POWER_KILOWATTS             2601
+#define IDS_POWER_MEGAWATTS             2602
+#define IDS_POWER_WATTS                 2603
 
 /* TYPE OF PRESSURES */
-#define IDS_PRESSURE_ATMOSPHERES        2800
-#define IDS_PRESSURE_BARS               2801
-#define IDS_PRESSURE_HECTOPASCALS       2802
-#define IDS_PRESSURE_KILOPASCALS        2803
-#define IDS_PRESSURE_MM_OF_MERCURY      2804
-#define IDS_PRESSURE_PASCALS            2805
-#define IDS_PRESSURE_PSI                2806
+#define IDS_PRESSURE_ATMOSPHERES        2701
+#define IDS_PRESSURE_BARS               2702
+#define IDS_PRESSURE_MM_OF_MERCURY      2703
+#define IDS_PRESSURE_PASCALS            2704
+#define IDS_PRESSURE_PSI                2705
 
 /* TYPES OF TEMPERATURES */
-#define IDS_TEMPERATURE_CELSIUS         2900
-#define IDS_TEMPERATURE_FAHRENHEIT      2901
-#define IDS_TEMPERATURE_KELVIN          2902
-#define IDS_TEMPERATURE_RANKINE         2903
-
-/* TYPE OF TIME */
-#define IDS_TIME_DAYS                   3001
-#define IDS_TIME_HOURS                  3002
-#define IDS_TIME_MICROSECONDS           3003
-#define IDS_TIME_MILLISECONDS           3004
-#define IDS_TIME_NANOSECONDS            3005
-#define IDS_TIME_MINUTES                3006
-#define IDS_TIME_SECONDS                3007
-#define IDS_TIME_WEEKS                  3008
-#define IDS_TIME_YEARS                  3009
+#define IDS_TEMPERATURE_CELSIUS         2800
+#define IDS_TEMPERATURE_FAHRENHEIT      2801
+#define IDS_TEMPERATURE_KELVIN          2802
+#define IDS_TEMPERATURE_RANKINE         2803
 
 /* TYPES OF VELOCITIES */
-#define IDS_VELOCITY_CMS_SECOND         3100
-#define IDS_VELOCITY_FEET_SECOND        3101
-#define IDS_VELOCITY_FEET_HOUR          3102
-#define IDS_VELOCITY_KILOMETERS_HOUR    3103
-#define IDS_VELOCITY_KNOTS              3104
-#define IDS_VELOCITY_MACH               3105
-#define IDS_VELOCITY_METERS_SECOND      3106
-#define IDS_VELOCITY_MILES_HOUR         3107
+#define IDS_VELOCITY_FEET_HOUR          2900
+#define IDS_VELOCITY_KILOMETERS_HOUR    2901
+#define IDS_VELOCITY_KNOTS              2902
+#define IDS_VELOCITY_MACH               2903
+#define IDS_VELOCITY_METERS_SECOND      2904
+#define IDS_VELOCITY_MILES_HOUR         2905
 
 /* TYPES OF VOLUMES */
-#define IDS_VOLUME_BARRELS_UK           3200
-#define IDS_VOLUME_BARRELS_OIL          3201
-#define IDS_VOLUME_BUN                  3202
-#define IDS_VOLUME_BUSHELS_UK           3203
-#define IDS_VOLUME_BUSHELS_US           3204
-#define IDS_VOLUME_CUBIC_CENTIMETERS    3205
-#define IDS_VOLUME_CUBIC_FEET           3206
-#define IDS_VOLUME_CUBIC_INCHES         3207
-#define IDS_VOLUME_CUBIC_METERS         3208
-#define IDS_VOLUME_CUBIC_YARDS          3209
-#define IDS_VOLUME_DOE                  3210
-#define IDS_VOLUME_FLUID_OUNCES_UK      3211
-#define IDS_VOLUME_FLUID_OUNCES_US      3212
-#define IDS_VOLUME_GALLONS_UK           3213
-#define IDS_VOLUME_GALLONS_DRY_US       3214
-#define IDS_VOLUME_GALLONS_LIQUID_US    3215
-#define IDS_VOLUME_GOU                  3216
-#define IDS_VOLUME_HOP                  3217
-#define IDS_VOLUME_ICCE                 3218
-#define IDS_VOLUME_KWIAN                3219
-#define IDS_VOLUME_LITERS               3220
-#define IDS_VOLUME_MAL                  3221
-#define IDS_VOLUME_MILLILITERS          3222
-#define IDS_VOLUME_PINTS_UK             3223
-#define IDS_VOLUME_PINTS_DRY_US         3224
-#define IDS_VOLUME_PINTS_LIQUID_US      3225
-#define IDS_VOLUME_QUARTS_UK            3226
-#define IDS_VOLUME_QUARTS_DRY_US        3227
-#define IDS_VOLUME_QUARTS_LIQUID_US     3228
-#define IDS_VOLUME_SEKI                 3229
-#define IDS_VOLUME_SYOU                 3230
-#define IDS_VOLUME_TANANLOUNG           3231
-#define IDS_VOLUME_TANG                 3232
-#define IDS_VOLUME_TO                   3233
+#define IDS_VOLUME_BARRELS_UK           3000
+#define IDS_VOLUME_BARRELS_OIL          3001
+#define IDS_VOLUME_BUN                  3002
+#define IDS_VOLUME_BUSHELS_UK           3003
+#define IDS_VOLUME_BUSHELS_US           3004
+#define IDS_VOLUME_CUBIC_CENTIMETERS    3005
+#define IDS_VOLUME_CUBIC_FEET           3006
+#define IDS_VOLUME_CUBIC_INCHES         3007
+#define IDS_VOLUME_CUBIC_METERS         3008
+#define IDS_VOLUME_CUBIC_YARDS          3009
+#define IDS_VOLUME_DOE                  3010
+#define IDS_VOLUME_FLUID_OUNCES_UK      3011
+#define IDS_VOLUME_FLUID_OUNCES_US      3012
+#define IDS_VOLUME_GALLONS_UK           3013
+#define IDS_VOLUME_GALLONS_DRY_US       3014
+#define IDS_VOLUME_GALLONS_LIQUID_US    3015
+#define IDS_VOLUME_GOU                  3016
+#define IDS_VOLUME_HOP                  3017
+#define IDS_VOLUME_ICCE                 3018
+#define IDS_VOLUME_KWIAN                3019
+#define IDS_VOLUME_LITERS               3020
+#define IDS_VOLUME_MAL                  3021
+#define IDS_VOLUME_MILLILITERS          3022
+#define IDS_VOLUME_PINTS_UK             3023
+#define IDS_VOLUME_PINTS_DRY_US         3024
+#define IDS_VOLUME_PINTS_LIQUID_US      3025
+#define IDS_VOLUME_QUARTS_UK            3026
+#define IDS_VOLUME_QUARTS_DRY_US        3027
+#define IDS_VOLUME_QUARTS_LIQUID_US     3028
+#define IDS_VOLUME_SEKI                 3029
+#define IDS_VOLUME_SYOU                 3030
+#define IDS_VOLUME_TANANLOUNG           3031
+#define IDS_VOLUME_TANG                 3032
+#define IDS_VOLUME_TO                   3033
 
 /* TYPES OF WEIGHTS */
-#define IDS_WEIGHT_BAHT                 3300
-#define IDS_WEIGHT_CARATS               3301
-#define IDS_WEIGHT_CHUNG                3302
-#define IDS_WEIGHT_DON                  3303
-#define IDS_WEIGHT_GEUN                 3304
-#define IDS_WEIGHT_GRAMS                3305
-#define IDS_WEIGHT_GWAN                 3306
-#define IDS_WEIGHT_HARB                 3307
-#define IDS_WEIGHT_JIN_CHINA            3308
-#define IDS_WEIGHT_JIN_TAIWAN           3309
-#define IDS_WEIGHT_KAN                  3310
-#define IDS_WEIGHT_KILOGRAMS            3311
-#define IDS_WEIGHT_KIN                  3312
-#define IDS_WEIGHT_LIANG_CHINA          3313
-#define IDS_WEIGHT_LIANG_TAIWAN         3314
-#define IDS_WEIGHT_MONME                3315
-#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS   3316
-#define IDS_WEIGHT_OUNCES_TROY          3317
-#define IDS_WEIGHT_POUNDS               3318
-#define IDS_WEIGHT_QUINTAL_METRIC       3319
-#define IDS_WEIGHT_SALOUNG              3320
-#define IDS_WEIGHT_STONES               3321
-#define IDS_WEIGHT_TAMLUNG              3322
-#define IDS_WEIGHT_TONNES               3323
-#define IDS_WEIGHT_TONS_UK              3324
-#define IDS_WEIGHT_TONS_US              3325
+#define IDS_WEIGHT_BAHT                 3100
+#define IDS_WEIGHT_CARATS               3101
+#define IDS_WEIGHT_CHUNG                3102
+#define IDS_WEIGHT_DON                  3103
+#define IDS_WEIGHT_GEUN                 3104
+#define IDS_WEIGHT_GRAMS                3105
+#define IDS_WEIGHT_GWAN                 3106
+#define IDS_WEIGHT_HARB                 3107
+#define IDS_WEIGHT_JIN_CHINA            3108
+#define IDS_WEIGHT_JIN_TAIWAN           3109
+#define IDS_WEIGHT_KAN                  3110
+#define IDS_WEIGHT_KILOGRAMS            3111
+#define IDS_WEIGHT_KIN                  3112
+#define IDS_WEIGHT_LIANG_CHINA          3113
+#define IDS_WEIGHT_LIANG_TAIWAN         3114
+#define IDS_WEIGHT_MONME                3115
+#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS   3116
+#define IDS_WEIGHT_OUNCES_TROY          3117
+#define IDS_WEIGHT_POUNDS               3118
+#define IDS_WEIGHT_QUINTAL_METRIC       3119
+#define IDS_WEIGHT_SALOUNG              3120
+#define IDS_WEIGHT_STONES               3121
+#define IDS_WEIGHT_TAMLUNG              3122
+#define IDS_WEIGHT_TONNES               3123
+#define IDS_WEIGHT_TONS_UK              3124
+#define IDS_WEIGHT_TONS_US              3125
 
 /* MENU */
 #define IDM_EDIT_COPY                   40002

base/applications/calc/resource.rc

@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <windows.h>
@@ -26,10 +26,6 @@
 #define IDC_STATIC    -1
 #endif
 
-#ifndef DS_SHELLFONT
-#define DS_SHELLFONT DS_SETFONT|DS_FIXEDSYS
-#endif
-
 // Common resources
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -44,20 +40,16 @@ IDI_CALC_SMALL          ICON    DISCARDABLE     "res/calc_sm.ico"
 IDB_BITMAP_ROS          BITMAP  DISCARDABLE     "res/ROS_logo.bmp"
 
 
+#include "lang/en-US.rc"
 #include "lang/bg-BG.rc"
 #include "lang/cs-CZ.rc"
 #include "lang/de-DE.rc"
-#include "lang/el-GR.rc"
-#include "lang/en-US.rc"
 #include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
 #include "lang/ko-KR.rc"
+#include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
-#include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
-#include "lang/ro-RO.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
-#include "lang/th-TH.rc"
 #include "lang/uk-UA.rc"

base/applications/calc/rpn.c

@@ -310,8 +310,6 @@ void run_operator(calc_node_t *result,
             operator_list[operation].op_p(&dc, &da, &db);
         } else
             operator_list[operation].op_f(&dc, &da, &db);
-        if (_finite(dc.f) == 0)
-            calc.is_nan = TRUE;
     } else {
         operator_list[operation].op_i(&dc, &da, &db);
         /* apply final limitator to result */
@@ -333,6 +331,7 @@ static void evalStack(calc_number_t *number)
     stack_node_t *op, ip;
     unsigned int prec;
 
+    percent_mode = FALSE;
     op = pop();
     ip = *op;
     prec = operator_list[ip.node.operation].prec;
@@ -374,18 +373,12 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func)
         return 0;
     }
 
-    if (func == RPN_OPERATOR_PERCENT)
-        percent_mode = TRUE;
-
     tmp.node.number = *number;
     tmp.node.base = calc.base;
     tmp.node.operation = func;
 
     push(&tmp);
 
-    if (func == RPN_OPERATOR_NONE)
-        return 0;
-
     if (func != RPN_OPERATOR_PARENT) {
         calc.last_operator = func;
         evalStack(number);

base/applications/calc/rpn_mpfr.c

@@ -311,6 +311,7 @@ static void evalStack(calc_number_t *number)
     unsigned int prec;
 
     mpfr_init(ip.node.number.mf);
+    percent_mode = FALSE;
     op = pop();
     node_copy(&ip, op);
     prec = operator_list[ip.node.operation].prec;
@@ -354,9 +355,6 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func)
         return 0;
     }
 
-    if (func == RPN_OPERATOR_PERCENT)
-        percent_mode = TRUE;
-
     mpfr_init(tmp.node.number.mf);
     rpn_copy(&tmp.node.number, number);
     tmp.node.operation = func;
@@ -364,9 +362,6 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func)
     push(&tmp);
     mpfr_clear(tmp.node.number.mf);
 
-    if (func == RPN_OPERATOR_NONE)
-        return 0;
-
     if (func != RPN_OPERATOR_PARENT) {
         calc.last_operator = func;
         evalStack(number);

base/applications/calc/utl.c

@@ -2,6 +2,7 @@
 
 void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
 {
+    TCHAR *ptr, *dst;
     calc_number_t tmp;
     int    width;
 
@@ -20,12 +21,9 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
         /* calculate the width of integer number */
         width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
         if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
-            _stprintf(buffer, TEXT("%#e"), rpn->f);
+            ptr = buffer + _stprintf(buffer, TEXT("%#le"), 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 sring ensures there is a '.': */
+            ptr = buffer + _stprintf(buffer, TEXT("%#*.*lf"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
             dst = _tcschr(buffer, TEXT('.'));
             while (--ptr > dst)
                 if (*ptr != TEXT('0'))

base/applications/calc/whatsnew.txt

@@ -1,24 +1,3 @@
-1.11 (20080813)
-=======================
-* Updated translations (thanks to the friends at ReactOS' community).
-* Added DS_SHELLFONT to some dialogs into various translations (sometimes it was specified, sometimes it was not).
-* Added support for newer conversion units.
-* Fixed mistake into english translation (lenghts -> lengths).
-* Now decimal and thousand separators can be also read directly from registry (NT only, not 9x/ME).
-* Fixed bug when pressing an operator twice (like '1++2=' caused error).
-* Now unary operators and constant generators won't break RPN queue.
-
-1.10 (20080813)
-=======================
-* Added Norvegian and Korean translations.
-* Fixed Polish and Slovak translations.
-* Fixed percent mode.
-* Fixed some unsignaled overflow errors.
-* Fixed conversion method, now scientific notation is recognized too.
-* Added compilation for UNICODE executables.
-* Plain MINGW toolchain do not support wWinMain function, so I switched to old WinMain if it is not under ReactOS' build tree.
-* Detect error if UNICODE version is launched into Win9x (avoid the lock).
-
 1.09 (20080630)
 =======================
 * Fixed bug with Conversion function: "Category" type must be found like "from" and "to" because the combobox sorts its items alphabetically.

base/applications/calc/winmain.c

@@ -38,10 +38,10 @@ typedef struct {
 } key2code_t;
 
 typedef struct {
-    WORD     idc;  // IDC for posting message
-    CHAR     key;  // Virtual key identifier
-    BYTE     mask; // enable/disable into the various modes.
-    COLORREF col;  // color used for drawing the text
+    WORD idc;  // IDC for posting message
+    CHAR key;  // Virtual key identifier
+    BYTE mask; // enable/disable into the various modes.
+    INT  col;  // color used for drawing the text
 } key3code_t;
 
 #define CTRL_FLAG   0x100
@@ -209,9 +209,9 @@ static const function_table_t function_table[] = {
     { IDC_BUTTON_DAT,  0,                         1, run_dat_sta, NULL,        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,     },
+    { IDC_BUTTON_CANC, 0,                         0, run_canc,    NULL,        NULL,     NULL,     },
+    { IDC_BUTTON_RIGHTPAR, 0,                     1, run_rpar,    NULL,        NULL,     NULL,     },
+    { IDC_BUTTON_LEFTPAR,  0,                     0, run_lpar,    NULL,        NULL,     NULL,     },
 };
 
 /*
@@ -223,9 +223,6 @@ static void load_config(void)
 {
     TCHAR buf[32];
     DWORD tmp;
-#if _WIN32_WINNT >= 0x0500
-    HKEY hKey;
-#endif
 
     /* Try to load last selected layout */
     GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf));
@@ -242,42 +239,9 @@ static void load_config(void)
     /* memory is empty at startup */
     calc.is_memory = FALSE;
 
-#if _WIN32_WINNT >= 0x0500
-    /* empty these values */
-    calc.sDecimal[0] = TEXT('\0');
-    calc.sThousand[0] = TEXT('\0');
-
-    /* try to open the registry */
-    if (RegOpenKeyEx(HKEY_CURRENT_USER, 
-                     TEXT("Control Panel\\International"),
-                     0,
-                     KEY_QUERY_VALUE,
-                     &hKey) == ERROR_SUCCESS) {
-        /* get these values (ignore errors) */
-        tmp = sizeof(calc.sDecimal);
-        RegQueryValueEx(hKey, TEXT("sDecimal"), NULL, NULL, (LPBYTE)calc.sDecimal, &tmp);
-
-        tmp = sizeof(calc.sThousand);
-        RegQueryValueEx(hKey, TEXT("sThousand"), NULL, NULL, (LPBYTE)calc.sThousand, &tmp);
-
-        /* close the key */
-        RegCloseKey(hKey);
-    }
-    /* if something goes wrong, let's apply the defaults */
-    if (calc.sDecimal[0] == TEXT('\0'))
-        _tcscpy(calc.sDecimal, TEXT("."));
-
-    if (calc.sThousand[0] == TEXT('\0'))
-        _tcscpy(calc.sThousand, TEXT(","));
-
-    /* get the string lengths */
-    calc.sDecimal_len = _tcslen(calc.sDecimal);
-    calc.sThousand_len = _tcslen(calc.sThousand);
-#else
     /* acquire regional settings */
     calc.sDecimal_len  = GetProfileString(TEXT("intl"), TEXT("sDecimal"), TEXT("."), calc.sDecimal, SIZEOF(calc.sDecimal));
     calc.sThousand_len = GetProfileString(TEXT("intl"), TEXT("sThousand"), TEXT(","), calc.sThousand, SIZEOF(calc.sThousand));
-#endif
 }
 
 static void save_config(void)
@@ -302,7 +266,7 @@ static LRESULT post_key_press(LPARAM lParam, WORD idc)
         return 1;
 
     if (!_tcscmp(ClassName, TEXT("Button"))) {
-        DWORD dwStyle = GetWindowLongPtr(hCtlWnd, GWL_STYLE) & 0xF;
+        DWORD dwStyle = GetWindowLong(hCtlWnd, GWL_STYLE) & 0xF;
 
         /* Set states for press/release, but only for push buttons */
         if (dwStyle == BS_PUSHBUTTON || dwStyle == BS_DEFPUSHBUTTON || dwStyle == BS_OWNERDRAW) {
@@ -820,18 +784,68 @@ static void delete_stat_item(int n)
 
 static char *ReadConversion(const char *formula)
 {
-    int len = strlen(formula);
-    char *str = (char *)malloc(len+3);
+    unsigned int  len = 256, n;
+    char         *str;
+    char         *code = NULL;
+    const char   *p = formula;
+    char          c;
+    calc_number_t x;
+    TCHAR         buffer[SIZEOF(calc.buffer)];
+#ifdef UNICODE
+    char          cbuffer[SIZEOF(calc.buffer)];
+#endif
 
+    str = (char *)malloc(len);
     if (str == NULL)
         return NULL;
 
-    str[0] = '(';
-    memcpy(str+1, formula, len);
-    str[len+1] = ')';
-    str[len+2] = '\0';
+    /* prepare code string */
+    rpn_alloc(&x);
+    convert_text2number(&x);
+    prepare_rpn_result(&x,
+                   buffer, SIZEOF(buffer),
+                   calc.base);
+    rpn_free(&x);
 
-    _tcscpy(calc.source, (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer);
+#ifdef UNICODE
+    WideCharToMultiByte(CP_ACP, 0, buffer, -1, cbuffer, SIZEOF(cbuffer), NULL, NULL);
+#endif
+
+    str[0] = '(';
+    n = 1;
+    while (1) {
+        if (code != NULL) {
+            c = *code++;
+            if (*code == '\0')
+                code = NULL;
+        } else
+            c = *p++;
+
+        if (c == '\0') {
+            str[n++] = ')';
+            if (n >= len-1) {
+                str = (char *)realloc(str, len += 16);
+                if (str == NULL)
+                    return NULL;
+            }
+            break;
+        } else
+        if (c == '$') {
+#ifdef UNICODE
+            code = cbuffer;
+#else
+            code = buffer;
+#endif
+            continue;
+        }
+        str[n++] = c;
+        if (n >= len-1) {
+            str = (char *)realloc(str, len += 16);
+            if (str == NULL)
+                return NULL;
+        }
+    }
+    str[n] = '\0';
 
     /* clear display content before proceeding */
     calc.ptr = calc.buffer;
@@ -840,7 +854,7 @@ static char *ReadConversion(const char *formula)
     return str;
 }
 
-static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+static LRESULT CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
     TCHAR buffer[SIZEOF(calc.buffer)];
     DWORD n;
@@ -861,18 +875,18 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
             n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
             if (n == (DWORD)-1)
                 return TRUE;
-            PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
+			PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
             return TRUE;
         case IDC_BUTTON_CD:
             n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
             if (n == (DWORD)-1)
                 return TRUE;
-            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
+			SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
             update_n_stats_items(hWnd, buffer);
             delete_stat_item(n);
             return TRUE;
         case IDC_BUTTON_CAD:
-            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
+			SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
             clean_stat_list();
             update_n_stats_items(hWnd, buffer);
             return TRUE;
@@ -910,20 +924,20 @@ static WPARAM idm_2_idc(int idm)
 static void CopyMemToClipboard(void *ptr)
 {
     if(OpenClipboard(NULL)) {
-        HGLOBAL  clipbuffer;
-        TCHAR   *buffer;
+	    HGLOBAL  clipbuffer;
+	    TCHAR   *buffer;
 
-        EmptyClipboard();
-        clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
-        buffer = (TCHAR *)GlobalLock(clipbuffer);
-        _tcscpy(buffer, ptr);
-        GlobalUnlock(clipbuffer);
+	    EmptyClipboard();
+	    clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
+	    buffer = (TCHAR *)GlobalLock(clipbuffer);
+	    _tcscpy(buffer, ptr);
+	    GlobalUnlock(clipbuffer);
 #ifdef UNICODE
-        SetClipboardData(CF_UNICODETEXT,clipbuffer);
+	    SetClipboardData(CF_UNICODETEXT,clipbuffer);
 #else
-        SetClipboardData(CF_TEXT,clipbuffer);
+	    SetClipboardData(CF_TEXT,clipbuffer);
 #endif
-        CloseClipboard();
+	    CloseClipboard();
     }
 }
 
@@ -942,16 +956,16 @@ static char *ReadClipboard(void)
     char *buffer = NULL;
 
     if (OpenClipboard(NULL)) {
-        HANDLE  hData = GetClipboardData(CF_TEXT);
+	    HANDLE  hData = GetClipboardData(CF_TEXT);
         char   *fromClipboard;
 
         if (hData != NULL) {
             fromClipboard = (char *)GlobalLock(hData);
             if (strlen(fromClipboard))
-                buffer = _strupr(_strdup(fromClipboard));
-            GlobalUnlock( hData );
+    	        buffer = _strupr(_strdup(fromClipboard));
+	        GlobalUnlock( hData );
         }
-        CloseClipboard();
+	    CloseClipboard();
     }
     return buffer;
 }
@@ -977,11 +991,6 @@ static char *handle_sequence_input(HWND hwnd, sequence_t *seq)
         case 'Q': PostMessage(hwnd, WM_COMMAND, (WPARAM)IDC_BUTTON_CANC, 0); break;
         case 'R': PostMessage(hwnd, WM_COMMAND, (WPARAM)IDC_BUTTON_MR, 0); break;
         }
-    } else
-    if (ch == '$') {
-        calc.ptr =
-        _tcscpy(calc.buffer, calc.source) +
-        _tcslen(calc.source);
     } else {
         for (x=0; x<SIZEOF(key2code); x++) {
             if (!(key2code[x].mask & BITMASK_IS_ASCII) ||
@@ -1110,20 +1119,20 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
 {
     TCHAR text[64];
     HMENU hMenu = CreatePopupMenu();
-    BOOL idm;
+    DWORD idm;
 
     LoadString(calc.hInstance, IDS_QUICKHELP, text, SIZEOF(text));
     AppendMenu(hMenu, MF_STRING | MF_ENABLED, IDM_HELP_HELP, text);
-    idm = TrackPopupMenu( hMenu,
-                          TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
-                          LOWORD(lp),
-                          HIWORD(lp),
-                          0,
-                          hWnd,
-                          NULL);
+    idm = (DWORD)TrackPopupMenu(hMenu,
+                                TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
+                                LOWORD(lp),
+                                HIWORD(lp),
+                                0,
+                                hWnd,
+                                NULL);
     DestroyMenu(hMenu);
 #ifndef DISABLE_HTMLHELP_SUPPORT
-    if (idm) {
+    if (idm != 0) {
         HH_POPUP popup;
 
         memset(&popup, 0, sizeof(popup));
@@ -1136,11 +1145,9 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
         popup.rcMargins.bottom = -1;
         popup.rcMargins.left   = -1;
         popup.rcMargins.right  = -1;
-        popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID);
+        popup.idString = GetWindowLong((HWND)wp, GWL_ID);
         HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup);
     }
-#else
-    (void)idm;
 #endif
 } 
 
@@ -1217,7 +1224,7 @@ static LRESULT CALLBACK SubclassButtonProc(HWND hWnd, WPARAM wp, LPARAM lp)
     return 1L;
 }
 
-static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+static LRESULT CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
     unsigned int x;
     RECT         rc;
@@ -1465,8 +1472,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
                         if (x == RPN_OPERATOR_EQUAL) {
                             exec_infix2postfix(&calc.code, calc.prev_operator);
                             rpn_copy(&calc.code, &calc.prev);
-                        } else
-                            break;
+                        }
                     }
 
                     /* if no change then quit silently, */
@@ -1608,8 +1614,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
                         convert_text2number(&calc.code);
                         cb(&calc.code);
                         display_rpn_result(hWnd, &calc.code);
-                        if (!(function_table[x].range & NO_CHAIN))
-                            exec_infix2postfix(&calc.code, RPN_OPERATOR_NONE);
                         if (function_table[x].range & MODIFIER_INV)
                             SendDlgItemMessage(hWnd, IDC_CHECK_INV, BM_SETCHECK, 0, 0);
                         if (function_table[x].range & MODIFIER_HYP)
@@ -1646,15 +1650,13 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
         }
         return TRUE;
     case WM_HANDLE_FROM:
-        if (calc.is_nan)
-            break;
-        if (handle_sequence_input(hWnd, &calc.Convert[0]) == NULL)
+        if (handle_sequence_input(hWnd, &calc.Convert[0]) == NULL) {
             PostMessage(hWnd, WM_START_CONV, 0,
                         MAKELPARAM(0x0001, WM_HANDLE_TO));
+        }
         return TRUE;
     case WM_HANDLE_TO:
-        if (!calc.is_nan)
-            handle_sequence_input(hWnd, &calc.Convert[1]);
+        handle_sequence_input(hWnd, &calc.Convert[1]);
         return TRUE;
     case WM_CLOSE:
         calc.action = IDC_STATIC;
@@ -1690,11 +1692,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
     return FALSE;
 }
 
-#if defined(__GNUC__) && !defined(__REACTOS__)
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
-#else
 int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nShowCmd)
-#endif
 {
     MSG msg;
     DWORD dwLayout;
@@ -1717,9 +1715,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
         else
             dwLayout = IDD_DIALOG_STANDARD;
 
-        /* This call will always fail if UNICODE for Win9x */
-        if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc))
-            break;
+        CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc);
 
         while (GetMessage(&msg, NULL, 0, 0)) {
 #ifndef USE_KEYBOARD_HOOK

base/applications/charmap/about.c

@@ -1,85 +1,83 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/charmap/about.c
- * PURPOSE:     about dialog
- * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-
-#include <precomp.h>
-
-
-static
-INT_PTR
-CALLBACK
-AboutDialogProc(HWND hDlg,
-                UINT message,
-                WPARAM wParam,
-                LPARAM lParam)
-{
-    static HICON hIcon = NULL;
-
-    switch (message)
-    {
-        case WM_INITDIALOG:
-        {
-            HWND  hLicenseEditWnd;
-            WCHAR strLicense[700];
-
-            hIcon = LoadImageW(hInstance,
-                               MAKEINTRESOURCEW(IDI_ICON),
-                               IMAGE_ICON,
-                               16,
-                               16,
-                               0);
-            if (hIcon)
-            {
-                SendMessageW(hDlg,
-                             WM_SETICON,
-                             ICON_SMALL,
-                             (LPARAM)hIcon);
-            }
-
-            hLicenseEditWnd = GetDlgItem(hDlg,
-                                         IDC_LICENSE_EDIT);
-
-            if (LoadStringW(hInstance,
-                            IDS_LICENSE,
-                            strLicense,
-                            sizeof(strLicense) / sizeof(WCHAR)))
-            {
-                SetWindowTextW(hLicenseEditWnd,
-                               strLicense);
-            }
-
-            return TRUE;
-        }
-
-        case WM_COMMAND:
-        {
-            if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
-            {
-                DestroyIcon(hIcon);
-                EndDialog(hDlg,
-                          LOWORD(wParam));
-                return TRUE;
-            }
-
-            break;
-        }
-    }
-
-    return FALSE;
-}
-
-
-VOID
-ShowAboutDlg(HWND hWndParent)
-{
-    DialogBoxW(hInstance,
-               MAKEINTRESOURCEW(IDD_ABOUTBOX),
-               hWndParent,
-               AboutDialogProc);
-}
+/*
+ * PROJECT:     ReactOS Character Map
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/charmap/about.c
+ * PURPOSE:     about dialog
+ * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
+ */
+
+
+#include <precomp.h>
+
+
+static INT_PTR CALLBACK
+AboutDialogProc(HWND hDlg,
+                UINT message,
+                WPARAM wParam,
+                LPARAM lParam)
+{
+    static HICON hIcon = NULL;
+
+    switch (message)
+    {
+        case WM_INITDIALOG:
+        {
+            HWND  hLicenseEditWnd;
+            WCHAR strLicense[700];
+
+            hIcon = LoadImageW(hInstance,
+                               MAKEINTRESOURCEW(IDI_ICON),
+                               IMAGE_ICON,
+                               16,
+                               16,
+                               0);
+            if (hIcon)
+            {
+                SendMessageW(hDlg,
+                             WM_SETICON,
+                             ICON_SMALL,
+                             (LPARAM)hIcon);
+            }
+
+            hLicenseEditWnd = GetDlgItem(hDlg,
+                                         IDC_LICENSE_EDIT);
+
+            if (LoadStringW(hInstance,
+                            IDS_LICENSE,
+                            strLicense,
+                            sizeof(strLicense) / sizeof(WCHAR)))
+            {
+                SetWindowTextW(hLicenseEditWnd,
+                               strLicense);
+            }
+
+            return TRUE;
+        }
+
+        case WM_COMMAND:
+        {
+            if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
+            {
+                DestroyIcon(hIcon);
+                EndDialog(hDlg,
+                          LOWORD(wParam));
+                return TRUE;
+            }
+
+            break;
+        }
+    }
+
+    return FALSE;
+}
+
+
+VOID
+ShowAboutDlg(HWND hWndParent)
+{
+    DialogBoxW(hInstance,
+               MAKEINTRESOURCEW(IDD_ABOUTBOX),
+               hWndParent,
+               AboutDialogProc);
+}

base/applications/charmap/charmap.c

@@ -1,368 +1,360 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/charmap/charmap.c
- * PURPOSE:     main dialog implementation
- * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-#include <precomp.h>
-
-#define ID_ABOUT    0x1
-
-HINSTANCE hInstance;
-
-/* Font-enumeration callback */
-static
-int
-CALLBACK
-EnumFontNames(ENUMLOGFONTEXW *lpelfe,
-              NEWTEXTMETRICEXW *lpntme,
-              DWORD FontType,
-              LPARAM lParam)
-{
-    HWND hwndCombo = (HWND)lParam;
-    LPWSTR pszName  = lpelfe->elfLogFont.lfFaceName;
-
-    /* make sure font doesn't already exist in our list */
-    if(SendMessageW(hwndCombo,
-                    CB_FINDSTRING,
-                    0,
-                    (LPARAM)pszName) == CB_ERR)
-    {
-        INT idx;
-        BOOL fFixed;
-        BOOL fTrueType;
-
-        /* add the font */
-        idx = (INT)SendMessageW(hwndCombo,
-                                CB_ADDSTRING,
-                                0,
-                                (LPARAM)pszName);
-
-        /* record the font's attributes (Fixedwidth and Truetype) */
-        fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE;
-        fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE;
-
-        /* store this information in the list-item's userdata area */
-        SendMessageW(hwndCombo,
-                     CB_SETITEMDATA,
-                     idx,
-                     MAKEWPARAM(fFixed, fTrueType));
-    }
-
-    return 1;
-}
-
-
-/* Initialize the font-list by enumeration all system fonts */
-static
-VOID
-FillFontStyleComboList(HWND hwndCombo)
-{
-    HDC hdc;
-    LOGFONTW lf;
-
-    /* FIXME: for fun, draw each font in its own style */
-    HFONT hFont = GetStockObject(DEFAULT_GUI_FONT);
-    SendMessageW(hwndCombo,
-                 WM_SETFONT,
-                 (WPARAM)hFont,
-                 0);
-
-    ZeroMemory(&lf, sizeof(lf));
-    lf.lfCharSet = DEFAULT_CHARSET;
-
-    hdc = GetDC(hwndCombo);
-
-    /* store the list of fonts in the combo */
-    EnumFontFamiliesExW(hdc,
-                        &lf,
-                        (FONTENUMPROCW)EnumFontNames,
-                        (LPARAM)hwndCombo,
-                        0);
-
-    ReleaseDC(hwndCombo,
-              hdc);
-
-    SendMessageW(hwndCombo,
-                 CB_SETCURSEL,
-                 0,
-                 0);
-}
-
-
-static
-VOID
-ChangeMapFont(HWND hDlg)
-{
-    HWND hCombo;
-    HWND hMap;
-    LPWSTR lpFontName;
-    INT Len;
-
-    hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO);
-
-    Len = GetWindowTextLengthW(hCombo);
-
-    if (Len != 0)
-    {
-        lpFontName = HeapAlloc(GetProcessHeap(),
-                               0,
-                               (Len + 1) * sizeof(WCHAR));
-
-        if (lpFontName)
-        {
-            SendMessageW(hCombo,
-                         WM_GETTEXT,
-                         Len + 1,
-                         (LPARAM)lpFontName);
-
-            hMap = GetDlgItem(hDlg, IDC_FONTMAP);
-
-            SendMessageW(hMap,
-                         FM_SETFONT,
-                         0,
-                         (LPARAM)lpFontName);
-        }
-
-        HeapFree(GetProcessHeap(),
-                 0,
-                 lpFontName);
-    }
-}
-
-
-static
-VOID
-AddCharToSelection(HWND hText,
-                   WCHAR ch)
-{
-    LPWSTR lpText;
-    INT Len = GetWindowTextLength(hText);
-
-    if (Len != 0)
-    {
-        lpText = HeapAlloc(GetProcessHeap(),
-                           0,
-                           (Len + 2) * sizeof(WCHAR));
-
-        if (lpText)
-        {
-            LPWSTR lpStr = lpText;
-
-            SendMessageW(hText,
-                         WM_GETTEXT,
-                         Len + 1,
-                         (LPARAM)lpStr);
-
-            lpStr += Len;
-            *lpStr = ch;
-            lpStr++;
-            *lpStr = L'\0';
-
-            SendMessageW(hText,
-                         WM_SETTEXT,
-                         0,
-                         (LPARAM)lpText);
-
-            HeapFree(GetProcessHeap(),
-                     0,
-                     lpText);
-        }
-    }
-    else
-    {
-        WCHAR szText[2];
-
-        szText[0] = ch;
-        szText[1] = L'\0';
-
-        SendMessageW(hText,
-                     WM_SETTEXT,
-                     0,
-                     (LPARAM)szText);
-    }
-}
-
-
-static
-INT_PTR
-CALLBACK
-DlgProc(HWND hDlg,
-        UINT Message,
-        WPARAM wParam,
-        LPARAM lParam)
-{
-    static HICON hSmIcon;
-    static HICON hBgIcon;
-    LPWSTR lpAboutText = NULL;
-
-    switch(Message)
-    {
-        case WM_INITDIALOG:
-        {
-            HMENU hSysMenu;
-
-            hSmIcon = LoadImageW(hInstance,
-                                 MAKEINTRESOURCEW(IDI_ICON),
-                                 IMAGE_ICON,
-                                 16,
-                                 16,
-                                 0);
-            if (hSmIcon)
-            {
-                 SendMessageW(hDlg,
-                              WM_SETICON,
-                              ICON_SMALL,
-                              (LPARAM)hSmIcon);
-            }
-
-            hBgIcon = LoadImageW(hInstance,
-                                 MAKEINTRESOURCEW(IDI_ICON),
-                                 IMAGE_ICON,
-                                 32,
-                                 32,
-                                 0);
-            if (hBgIcon)
-            {
-                SendMessageW(hDlg,
-                             WM_SETICON,
-                             ICON_BIG,
-                             (LPARAM)hBgIcon);
-            }
-
-            FillFontStyleComboList(GetDlgItem(hDlg,
-                                              IDC_FONTCOMBO));
-
-            ChangeMapFont(hDlg);
-            hSysMenu = GetSystemMenu(hDlg,
-                                     FALSE);
-            if (hSysMenu != NULL)
-            {
-                if (LoadStringW(hInstance,
-                                IDS_ABOUT,
-                                lpAboutText,
-                                0))
-                {
-                    AppendMenuW(hSysMenu,
-                                MF_SEPARATOR,
-                                0,
-                                NULL);
-                    AppendMenuW(hSysMenu,
-                                MF_STRING,
-                                ID_ABOUT,
-                                lpAboutText);
-                }
-            }
-            return TRUE;
-        }
-
-        case WM_COMMAND:
-        {
-            switch(LOWORD(wParam))
-            {
-                case IDC_FONTMAP:
-                {
-                    switch (HIWORD(wParam))
-                    {
-                        case FM_SETCHAR:
-                            AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
-                                               LOWORD(lParam));
-                            break;
-                    }
-                }
-                break;
-
-                case IDC_FONTCOMBO:
-                {
-                    if (HIWORD(wParam) == CBN_SELCHANGE)
-                    {
-                        ChangeMapFont(hDlg);
-                    }
-                }
-                break;
-
-                case IDC_SELECT:
-                {
-                    WCHAR ch;
-                    HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
-
-                    ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
-
-                    if (ch)
-                    {
-                        AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
-                                           ch);
-                    }
-
-                    break;
-                }
-
-                case IDOK:
-                    if (hSmIcon)
-                        DestroyIcon(hSmIcon);
-                    if (hBgIcon)
-                        DestroyIcon(hBgIcon);
-                    EndDialog(hDlg, 0);
-                break;
-            }
-        }
-        break;
-
-        case WM_SYSCOMMAND:
-        {
-            switch(wParam)
-            {
-                case ID_ABOUT:
-                    ShowAboutDlg(hDlg);
-                break;
-            }
-        }
-        break;
-
-        case WM_CLOSE:
-            if (hSmIcon)
-                DestroyIcon(hSmIcon);
-            if (hBgIcon)
-                DestroyIcon(hBgIcon);
-            EndDialog(hDlg, 0);
-            break;
-
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-
-INT
-WINAPI
-wWinMain(HINSTANCE hInst,
-         HINSTANCE hPrev,
-         LPWSTR Cmd,
-         int iCmd)
-{
-    INITCOMMONCONTROLSEX iccx;
-    INT Ret = 1;
-
-    hInstance = hInst;
-
-    iccx.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    iccx.dwICC = ICC_TAB_CLASSES;
-    InitCommonControlsEx(&iccx);
-
-    if (RegisterMapClasses(hInstance))
-    {
-        Ret = DialogBoxW(hInstance,
-                         MAKEINTRESOURCEW(IDD_CHARMAP),
-                         NULL,
-                         DlgProc) >= 0;
-
-        UnregisterMapClasses(hInstance);
-    }
-
-    return Ret;
-}
+/*
+ * PROJECT:     ReactOS Character Map
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/charmap/charmap.c
+ * PURPOSE:     main dialog implementation
+ * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
+ */
+
+#include <precomp.h>
+
+#define ID_ABOUT    0x1
+
+HINSTANCE hInstance;
+
+/* Font-enumeration callback */
+static int CALLBACK
+EnumFontNames(ENUMLOGFONTEXW *lpelfe,
+              NEWTEXTMETRICEXW *lpntme,
+              DWORD FontType,
+              LPARAM lParam)
+{
+    HWND hwndCombo = (HWND)lParam;
+    LPWSTR pszName  = lpelfe->elfLogFont.lfFaceName;
+
+    /* make sure font doesn't already exist in our list */
+    if(SendMessageW(hwndCombo,
+                    CB_FINDSTRING,
+                    0,
+                    (LPARAM)pszName) == CB_ERR)
+    {
+        INT idx;
+        BOOL fFixed;
+        BOOL fTrueType;
+
+        /* add the font */
+        idx = (INT)SendMessageW(hwndCombo,
+                                CB_ADDSTRING,
+                                0,
+                                (LPARAM)pszName);
+
+        /* record the font's attributes (Fixedwidth and Truetype) */
+        fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE;
+        fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE;
+
+        /* store this information in the list-item's userdata area */
+        SendMessageW(hwndCombo,
+                     CB_SETITEMDATA,
+                     idx,
+                     MAKEWPARAM(fFixed, fTrueType));
+    }
+
+    return 1;
+}
+
+
+/* Initialize the font-list by enumeration all system fonts */
+static VOID
+FillFontStyleComboList(HWND hwndCombo)
+{
+    HDC hdc;
+    LOGFONTW lf;
+
+    /* FIXME: for fun, draw each font in its own style */
+    HFONT hFont = GetStockObject(DEFAULT_GUI_FONT);
+    SendMessageW(hwndCombo,
+                 WM_SETFONT,
+                 (WPARAM)hFont,
+                 0);
+
+    ZeroMemory(&lf, sizeof(lf));
+    lf.lfCharSet = DEFAULT_CHARSET;
+
+    hdc = GetDC(hwndCombo);
+
+    /* store the list of fonts in the combo */
+    EnumFontFamiliesExW(hdc,
+                        &lf,
+                        (FONTENUMPROCW)EnumFontNames,
+                        (LPARAM)hwndCombo,
+                        0);
+
+    ReleaseDC(hwndCombo,
+              hdc);
+
+    SendMessageW(hwndCombo,
+                 CB_SETCURSEL,
+                 0,
+                 0);
+}
+
+
+static VOID
+ChangeMapFont(HWND hDlg)
+{
+    HWND hCombo;
+    HWND hMap;
+    LPWSTR lpFontName;
+    INT Len;
+
+    hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO);
+
+    Len = GetWindowTextLengthW(hCombo);
+
+    if (Len != 0)
+    {
+        lpFontName = HeapAlloc(GetProcessHeap(),
+                               0,
+                               (Len + 1) * sizeof(WCHAR));
+
+        if (lpFontName)
+        {
+            SendMessageW(hCombo,
+                         WM_GETTEXT,
+                         Len + 1,
+                         (LPARAM)lpFontName);
+
+            hMap = GetDlgItem(hDlg, IDC_FONTMAP);
+
+            SendMessageW(hMap,
+                         FM_SETFONT,
+                         0,
+                         (LPARAM)lpFontName);
+        }
+
+        HeapFree(GetProcessHeap(),
+                 0,
+                 lpFontName);
+    }
+}
+
+
+static VOID
+AddCharToSelection(HWND hText,
+                   WCHAR ch)
+{
+    LPWSTR lpText;
+    INT Len = GetWindowTextLength(hText);
+
+    if (Len != 0)
+    {
+        lpText = HeapAlloc(GetProcessHeap(),
+                           0,
+                           (Len + 2) * sizeof(WCHAR));
+
+        if (lpText)
+        {
+            LPWSTR lpStr = lpText;
+
+            SendMessageW(hText,
+                         WM_GETTEXT,
+                         Len + 1,
+                         (LPARAM)lpStr);
+
+            lpStr += Len;
+            *lpStr = ch;
+            lpStr++;
+            *lpStr = L'\0';
+
+            SendMessageW(hText,
+                         WM_SETTEXT,
+                         0,
+                         (LPARAM)lpText);
+
+            HeapFree(GetProcessHeap(),
+                     0,
+                     lpText);
+        }
+    }
+    else
+    {
+        WCHAR szText[2];
+
+        szText[0] = ch;
+        szText[1] = L'\0';
+
+        SendMessageW(hText,
+                     WM_SETTEXT,
+                     0,
+                     (LPARAM)szText);
+    }
+}
+
+
+static BOOL CALLBACK
+DlgProc(HWND hDlg,
+        UINT Message,
+        WPARAM wParam,
+        LPARAM lParam)
+{
+    static HICON hSmIcon;
+    static HICON hBgIcon;
+    LPWSTR lpAboutText = NULL;
+
+    switch(Message)
+    {
+        case WM_INITDIALOG:
+        {
+            HMENU hSysMenu;
+
+            hSmIcon = LoadImageW(hInstance,
+                                 MAKEINTRESOURCEW(IDI_ICON),
+                                 IMAGE_ICON,
+                                 16,
+                                 16,
+                                 0);
+            if (hSmIcon)
+            {
+                 SendMessageW(hDlg,
+                              WM_SETICON,
+                              ICON_SMALL,
+                              (LPARAM)hSmIcon);
+            }
+
+            hBgIcon = LoadImageW(hInstance,
+                                 MAKEINTRESOURCEW(IDI_ICON),
+                                 IMAGE_ICON,
+                                 32,
+                                 32,
+                                 0);
+            if (hBgIcon)
+            {
+                SendMessageW(hDlg,
+                             WM_SETICON,
+                             ICON_BIG,
+                             (LPARAM)hBgIcon);
+            }
+
+            FillFontStyleComboList(GetDlgItem(hDlg,
+                                              IDC_FONTCOMBO));
+
+            ChangeMapFont(hDlg);
+            hSysMenu = GetSystemMenu(hDlg,
+                                     FALSE);
+            if (hSysMenu != NULL)
+            {
+                if (LoadStringW(hInstance,
+                                IDS_ABOUT,
+                                lpAboutText,
+                                0))
+                {
+                    AppendMenuW(hSysMenu,
+                                MF_SEPARATOR,
+                                0,
+                                NULL);
+                    AppendMenuW(hSysMenu,
+                                MF_STRING,
+                                ID_ABOUT,
+                                lpAboutText);
+                }
+            }
+            return TRUE;
+        }
+
+        case WM_COMMAND:
+        {
+            switch(LOWORD(wParam))
+            {
+                case IDC_FONTMAP:
+                {
+                    switch (HIWORD(wParam))
+                    {
+                        case FM_SETCHAR:
+                            AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
+                                               LOWORD(lParam));
+                            break;
+                    }
+                }
+                break;
+
+                case IDC_FONTCOMBO:
+                {
+                    if (HIWORD(wParam) == CBN_SELCHANGE)
+                    {
+                        ChangeMapFont(hDlg);
+                    }
+                }
+                break;
+
+                case IDC_SELECT:
+                {
+                    WCHAR ch;
+                    HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
+
+                    ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
+
+                    if (ch)
+                    {
+                        AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
+                                           ch);
+                    }
+
+                    break;
+                }
+
+                case IDOK:
+                    if (hSmIcon)
+                        DestroyIcon(hSmIcon);
+                    if (hBgIcon)
+                        DestroyIcon(hBgIcon);
+                    EndDialog(hDlg, 0);
+                break;
+            }
+        }
+        break;
+
+        case WM_SYSCOMMAND:
+        {
+            switch(wParam)
+            {
+                case ID_ABOUT:
+                    ShowAboutDlg(hDlg);
+                break;
+            }
+        }
+        break;
+
+        case WM_CLOSE:
+            if (hSmIcon)
+                DestroyIcon(hSmIcon);
+            if (hBgIcon)
+                DestroyIcon(hBgIcon);
+            EndDialog(hDlg, 0);
+            break;
+
+        default:
+            return FALSE;
+    }
+
+    return FALSE;
+}
+
+
+INT WINAPI
+wWinMain(HINSTANCE hInst,
+         HINSTANCE hPrev,
+         LPWSTR Cmd,
+         int iCmd)
+{
+    INITCOMMONCONTROLSEX iccx;
+    INT Ret = 1;
+
+    hInstance = hInst;
+
+    iccx.dwSize = sizeof(INITCOMMONCONTROLSEX);
+    iccx.dwICC = ICC_TAB_CLASSES;
+    InitCommonControlsEx(&iccx);
+
+    if (RegisterMapClasses(hInstance))
+    {
+        Ret = DialogBoxW(hInstance,
+                         MAKEINTRESOURCEW(IDD_CHARMAP),
+                         NULL,
+                         (DLGPROC)DlgProc) >= 0;
+
+        UnregisterMapClasses(hInstance);
+    }
+
+    return Ret;
+}

base/applications/charmap/charmap.rbuild

@@ -1,16 +1,19 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
-	<include base="charmap">.</include>
-	<library>gdi32</library>
-	<library>user32</library>
-	<library>comctl32</library>
-	<compilationunit name="unit.c">
-		<file>about.c</file>
-		<file>charmap.c</file>
-		<file>lrgcell.c</file>
-		<file>map.c</file>
-	</compilationunit>
-	<file>charmap.rc</file>
-	<pch>precomp.h</pch>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
+	<include base="charmap">.</include>
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<library>gdi32</library>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>comctl32</library>
+	<compilationunit name="unit.c">
+		<file>about.c</file>
+		<file>charmap.c</file>
+		<file>lrgcell.c</file>
+		<file>map.c</file>
+	</compilationunit>
+	<file>charmap.rc</file>
+	<pch>precomp.h</pch>
+</module>

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

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "&<26><>..."
 END

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

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "&En quant a..."
 END

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

@@ -35,6 +35,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "&O programu..."
 END

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

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "<22>&ber..."
 END

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

@@ -32,6 +32,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 END

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

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "A&bout..."
 END

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

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "&Acerca de ..."
 END

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

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publi<EFBFBD>e par la Free Software Foundation; dans sa version 2  (ou selon votre pr<70>f<EFBFBD>rence) toute version ult<6C>rieure.\r\n\r\nCe programme est distribu<EFBFBD> dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans m<>me une garantie implicite de COMMERCIABILIT<EFBFBD> ou DE CONFORMIT<49> <20> UNE UTILISATION PARTICULI<4C>RE. \r\n\r\nVoir la Licence Publique G<>n<EFBFBD>rale GNU pour plus de d<EFBFBD>tails. Vous devriez avoir re<72>u un exemplaire de la Licence Publique G<>n<EFBFBD>rale GNU avec ce programme ; si ce n'est pas le cas, <20>crivez <20> la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "<22> propos..."
 END

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

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU.  Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU.  Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "Te&ntang..."
 END

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

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

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

@@ -1,35 +0,0 @@
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\"
-FONT 9,"MS UI Gothic",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
-BEGIN
-  LTEXT         "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g:", IDC_STATIC, 6, 7, 24, 9
-  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "<22>w<EFBFBD><77><EFBFBD>v", IDC_CMHELP, 249, 5, 35, 13
-  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "<22>R<EFBFBD>s<EFBFBD>[<5B><><EFBFBD>镶<EFBFBD><E995B6>:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "<22>I<EFBFBD><49>", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "<22>R<EFBFBD>s<EFBFBD>[", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "<22>ڍו\\<5C><>", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\<5C>ɂ‚<C982><C282><EFBFBD>"
-FONT 9,"MS UI Gothic",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-  PUSHBUTTON    "<22>‚<EFBFBD><C282><EFBFBD>", IDOK, 75, 162, 44, 15
-  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-  IDS_ABOUT     "<22>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&B)..."
-END

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

@@ -33,6 +33,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "<22><><EFBFBD><EFBFBD>(&A)"
 END

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

@@ -1,44 +1,44 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/charmap/lang/lt-LT.rc
- * PURPOSE:     Lithuanian Language File
- * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
- * DATE:        2007-09-23
- */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Simboli<6C> lentel<65>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
-BEGIN
-  LTEXT         "<22>riftas:", IDC_STATIC, 6, 7, 24, 9
-  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "Pagalba", IDC_CMHELP, 249, 5, 35, 13
-  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "Simboliai kopijavimui:", IDC_STATIC, 6, 188, 72, 9
-  EDITTEXT       IDC_TEXTBOX, 81, 186, 107, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "Parinkti", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "Kopijuoti", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "Apie simboli<6C> lentel<65>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT         "Simboli<EFBFBD> lentel<65> v0.1\n(C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-  PUSHBUTTON    "U<>verti", IDOK, 83, 161, 44, 15
-  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-  IDS_ABOUT     "&Apie..."
-END
+/*
+ * PROJECT:     ReactOS Character Map
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/charmap/lang/lt-LT.rc
+ * PURPOSE:     Lithuanian Language File
+ * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
+ * DATE:        2007-09-23
+ */
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
+CAPTION "Simboli<6C> lentel<65>"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+BEGIN
+  LTEXT         "<22>riftas:", IDC_STATIC, 6, 7, 24, 9
+  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
+  PUSHBUTTON    "Pagalba", IDC_CMHELP, 249, 5, 35, 13
+  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
+  LTEXT         "Simboliai kopijavimui:", IDC_STATIC, 6, 188, 72, 9
+  EDITTEXT       IDC_TEXTBOX, 81, 186, 107, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  DEFPUSHBUTTON "Parinkti", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "Kopijuoti", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,210,182
+CAPTION "Apie simboli<6C> lentel<65>"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT         "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+  PUSHBUTTON    "U<>verti", IDOK, 83, 161, 44, 15
+  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_ABOUT     "&Apie..."
+END

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

@@ -0,0 +1,35 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
+CAPTION "Tegnkart"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+BEGIN
+  LTEXT         "Skrift:", IDC_STATIC, 6, 7, 24, 9
+  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
+  PUSHBUTTON    "Hjelp", IDC_CMHELP, 249, 5, 35, 13
+  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
+  LTEXT         "Kopier f<>lgende tegn:", IDC_STATIC, 6, 188, 66, 9
+  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  DEFPUSHBUTTON "Velg", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "Kopier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+  //AUTOCHECKBOX  "Avansert visning", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,210,182
+CAPTION "Om Tegnkart"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT         "Tegnkart v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+  PUSHBUTTON    "Lukk", IDOK, 75, 162, 44, 15
+  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_ABOUT     "O&m..."
+END

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

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "Over..."
 END

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

@@ -1,35 +0,0 @@
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Tegnkart"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
-BEGIN
-  LTEXT         "Skrift:", IDC_STATIC, 6, 7, 24, 9
-  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "Hjelp", IDC_CMHELP, 249, 5, 35, 13
-  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "Kopier f<>lgende tegn:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "Velg", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "Kopier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Avansert visning", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "Om Tegnkart"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT         "Tegnkart v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-  PUSHBUTTON    "Lukk", IDOK, 75, 162, 44, 15
-  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE   "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation;  version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i h<>p for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORM<52>L.  Se p<> GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-  IDS_ABOUT     "O&m..."
-END

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

@@ -3,7 +3,6 @@
 * xxrogers@users.sourceforge.net
 * https://sourceforge.net/projects/reactospl
 */
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
@@ -36,6 +35,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Niniejszy program jest wolnym oprogramowaniem; mo<6D>esz go rozprowadza<7A> dalej i/lub modyfikowa<77> na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacj<63> Wolnego Oprogramowania - wed<65>ug wersji 2 tej Licencji lub (wed<65>ug twojego wyboru) kt<6B>rej<65> z p<><70>niejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej<65>, i<> b<>dzie on u<>yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domy<6D>lnej gwarancji PRZYDATNO<4E>CI HANDLOWEJ albo PRZYDATNO<4E>CI DO OKRE<52>LONYCH ZASTOSOWA<57>. W celu uzyskania bli<6C>szych informacji si<73>gnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewno<6E>ci<63> wraz z niniejszym programem otrzyma<6D>e<EFBFBD> te<74> egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); je<6A>li nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "Niniejszy program jest wolnym oprogramowaniem; mo<6D>esz go rozprowadza<7A> dalej i/lub modyfikowa<77> na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacj<63> Wolnego Oprogramowania - wed<65>ug wersji 2 tej Licencji lub (wed<65>ug twojego wyboru) kt<6B>rej<65> z p<><70>niejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej<65>, i<> b<>dzie on u<>yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domy<6D>lnej gwarancji PRZYDATNO<4E>CI HANDLOWEJ albo PRZYDATNO<4E>CI DO OKRE<52>LONYCH ZASTOSOWA<57>. W celu uzyskania bli<6C>szych informacji si<73>gnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewno<6E>ci<63> wraz z niniejszym programem otrzyma<6D>e<EFBFBD> te<74> egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); je<6A>li nie - napisz do Free Software Foundation, Inc., 59 Temple Place, Fifth Floor, Boston, MA  02110-1301  USA."
   IDS_ABOUT     "&O programie..."
 END

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

@@ -32,6 +32,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> (<28><><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE   "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> (<28><><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "&<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 END

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

@@ -1,10 +1,9 @@
 /*
- * PROJECT:      Character Map
- * FILE:         base/applications/charmap/lang/sk-SK.rc
- * PURPOSE:      Slovak Language File for charmap
- * TRANSLATOR:   Kario (kario@szm.sk) /M<>rio Ka<4B>m<EFBFBD>r/
- * DATE OF TR.:  24-07-2007
- * LAST CHANGE:  29-08-2008
+ * PROJECT:     Character Map
+ * FILE:        base/applications/charmap/lang/sk-SK.rc
+ * PURPOSE:     Slovak Language File for charmap
+ * TRANSLATOR:  Kario (kario@szm.sk) /M<>rio Ka<4B>m<EFBFBD>r/
+ * DATE OF TR:  24-07-2007
  */
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
@@ -39,6 +38,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE,  "Tento program je vo<76>n<EFBFBD> softv<74>r; m<><6D>ete ho <20><>ri<72> a/alebo modifikova<76> pod<6F>a podmienok GNU V<>eobecnej verejnej licencie (GNU General Public License) ako bola zverejnen<65> nad<61>ciou Free Software Foundation; bu<62> verzie 2 tejto licencie, alebo (pod<6F>a V<><56>ho uv<75><76>enia) niektorej neskor<6F>ej verzie.\r\n\r\nTento program je distribuovan<61> v n<>deji, <20>e bude u<>ito<74>n<EFBFBD>, av<61>ak BEZ AKEJKO<4B>VEK Z<>RUKY; rovnako bez z<>ruky PREDAJNOSTI alebo VHODNOSTI PRE UR<55>IT<49> <20><>EL. Pre viac detailov si pozrite GNU V<>eobecn<63> verejn<6A> licenciu (GNU General Public License).\r\n\r\nK<6E>piu V<>eobecnej verejnej licencie GNU ste mali dosta<74> spolu s t<>mto programom; ak nie, nap<61><70>te si o <20>u na Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE,  "Tento program je vo<76>n<EFBFBD> softv<74>r; m<><6D>ete ho <20><>ri<72> a/alebo modifikova<76> pod<6F>a podmienok GNU V<>eobecnej verejnej licencie (GNU General Public License) ako bola zverejnen<65> nad<61>ciou Free Software Foundation; bu<62> verzie 2 tejto licencie, alebo (pod<6F>a V<><56>ho uv<75><76>enia) niektorej neskor<6F>ej verzie.\r\n\r\nTento program je distribuovan<61> v n<>deji, <20>e bude u<>ito<74>n<EFBFBD>, av<61>ak BEZ AKEJKO<4B>VEK Z<>RUKY; rovnako bez z<>ruky PREDAJNOSTI alebo VHODNOSTI PRE UR<55>IT<49> <20><>EL. Pre viac detailov si pozrite GNU V<>eobecn<63> verejn<6A> licenciu (GNU General Public License).\r\n\r\nK<6E>piu V<>eobecnej verejnej licencie GNU Ste mali dosta<74> spolu s t<>mto programom; ak nie, nap<61><70>te si o <20>u na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
   IDS_ABOUT     "<22>&o je Mapa znakov"
 END

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

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/charmap/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for charmap
- * TRANSLATOR:  Artem Reznikov & Sakara Yevhen
+ * TRANSLATOR:  Artem Reznikov
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -21,12 +21,12 @@ BEGIN
   EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
+CAPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
@@ -38,6 +38,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>䳿 <20><> <20><>, <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><D2B2> <20><><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-  IDS_ABOUT     "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
+  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_ABOUT     "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 END

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

@@ -1,37 +0,0 @@
-// Chinese (Simplified) language resource file (Elton Chung, elton328@gmail.com)
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "<22>ַ<EFBFBD><D6B7><EFBFBD>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
-BEGIN
-  LTEXT         "<22><><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 7, 24, 9
-  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "˵<><CBB5>", IDC_CMHELP, 249, 5, 35, 13
-  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5>ַ<EFBFBD>:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "ѡ<><D1A1>", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT         "<22>ַ<EFBFBD><D6B7><EFBFBD> v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-  PUSHBUTTON    "<22>ر<EFBFBD>", IDOK, 75, 162, 44, 15
-  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
-  IDS_ABOUT     "<22><><EFBFBD><EFBFBD>(&A)..."
-END

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

@@ -1,37 +0,0 @@
-// Chinese (Traditional) language resource file (Elton Chung, elton328@gmail.com)
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "<22>r<EFBFBD>Ū<EFBFBD>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
-BEGIN
-  LTEXT         "<22>r<EFBFBD><72><EFBFBD>G", IDC_STATIC, 6, 7, 24, 9
-  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDC_CMHELP, 249, 5, 35, 13
-  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "<22>ݽƻs<C6BB><73><EFBFBD>r<EFBFBD>šG", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD>", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "<22>ƻs", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>r<EFBFBD>Ū<EFBFBD>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT         "<22>r<EFBFBD>Ū<EFBFBD> v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDOK, 75, 162, 44, 15
-  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE   "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
-  IDS_ABOUT     "<22><><EFBFBD><EFBFBD>(&A)..."
-END

base/applications/charmap/lrgcell.c

@@ -1,165 +1,164 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/charmap/lrgcell.c
- * PURPOSE:     large cell window implementation
- * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-#include <precomp.h>
-
-
-static
-HFONT
-SetLrgFont(PMAP infoPtr)
-{
-    LOGFONTW lf;
-    HFONT hFont = NULL;
-    HDC hdc;
-    HWND hCombo;
-    LPWSTR lpFontName;
-    INT Len;
-
-    hCombo = GetDlgItem(infoPtr->hParent,
-                        IDC_FONTCOMBO);
-
-    Len = GetWindowTextLengthW(hCombo);
-
-    if (Len != 0)
-    {
-        lpFontName = HeapAlloc(GetProcessHeap(),
-                               0,
-                               (Len + 1) * sizeof(WCHAR));
-
-        if (lpFontName)
-        {
-            SendMessageW(hCombo,
-                         WM_GETTEXT,
-                         31,
-                         (LPARAM)lpFontName);
-
-            ZeroMemory(&lf,
-                       sizeof(lf));
-
-            hdc = GetDC(infoPtr->hLrgWnd);
-            lf.lfHeight = GetDeviceCaps(hdc,
-                                        LOGPIXELSY) / 2;
-            ReleaseDC(infoPtr->hLrgWnd,
-                      hdc);
-
-            lf.lfCharSet =  DEFAULT_CHARSET;
-            wcscpy(lf.lfFaceName,
-                   lpFontName);
-
-            hFont = CreateFontIndirectW(&lf);
-
-            HeapFree(GetProcessHeap(),
-                     0,
-                     lpFontName);
-        }
-    }
-
-    return hFont;
-}
-
-
-LRESULT CALLBACK
-LrgCellWndProc(HWND hwnd,
-               UINT uMsg,
-               WPARAM wParam,
-               LPARAM lParam)
-{
-    PMAP infoPtr;
-    LRESULT Ret = 0;
-    static INT cxClient, cyClient;
-    static RECT rc;
-    static HFONT hFont = NULL;
-
-    infoPtr = (PMAP)GetWindowLongPtrW(hwnd,
-                                     GWLP_USERDATA);
-
-    if (infoPtr == NULL && uMsg != WM_CREATE)
-    {
-        goto HandleDefaultMessage;
-    }
-
-    switch (uMsg)
-    {
-        case WM_CREATE:
-        {
-            infoPtr = (PMAP)(((LPCREATESTRUCTW)lParam)->lpCreateParams);
-
-            SetWindowLongPtrW(hwnd,
-                              GWLP_USERDATA,
-                              (LONG_PTR)infoPtr);
-
-            hFont = SetLrgFont(infoPtr);
-
-            break;
-        }
-
-        case WM_SIZE:
-        {
-            cxClient = LOWORD(lParam);
-            cyClient = HIWORD(lParam);
-
-            rc.left = 0;
-            rc.top = 0;
-            rc.right = cxClient;
-            rc.bottom = cyClient;
-
-            break;
-        }
-
-        case WM_PAINT:
-        {
-            PAINTSTRUCT ps;
-            HDC hdc;
-            HFONT hOldFont;
-
-            hdc = BeginPaint(hwnd,
-                             &ps);
-
-            Rectangle(hdc,
-                      0,
-                      0,
-                      cxClient,
-                      cyClient);
-
-            hOldFont = SelectObject(hdc, hFont);
-
-            DrawTextW(hdc,
-                      &infoPtr->pActiveCell->ch,
-                      1,
-                      &rc,
-                      DT_CENTER | DT_VCENTER | DT_SINGLELINE);
-
-            SelectObject(hdc, hOldFont);
-
-            EndPaint(hwnd,
-                     &ps);
-
-            break;
-        }
-
-        case WM_DESTROY:
-        {
-            DeleteObject(hFont);
-
-            break;
-        }
-
-        default:
-        {
-HandleDefaultMessage:
-            Ret = DefWindowProcW(hwnd,
-                                 uMsg,
-                                 wParam,
-                                 lParam);
-            break;
-        }
-    }
-
-    return Ret;
-}
+/*
+ * PROJECT:     ReactOS Character Map
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/charmap/lrgcell.c
+ * PURPOSE:     large cell window implementation
+ * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
+ */
+
+#include <precomp.h>
+
+
+static HFONT
+SetLrgFont(PMAP infoPtr)
+{
+    LOGFONTW lf;
+    HFONT hFont = NULL;
+    HDC hdc;
+    HWND hCombo;
+    LPWSTR lpFontName;
+    INT Len;
+
+    hCombo = GetDlgItem(infoPtr->hParent,
+                        IDC_FONTCOMBO);
+
+    Len = GetWindowTextLengthW(hCombo);
+
+    if (Len != 0)
+    {
+        lpFontName = HeapAlloc(GetProcessHeap(),
+                               0,
+                               (Len + 1) * sizeof(WCHAR));
+
+        if (lpFontName)
+        {
+            SendMessageW(hCombo,
+                         WM_GETTEXT,
+                         31,
+                         (LPARAM)lpFontName);
+
+            ZeroMemory(&lf,
+                       sizeof(lf));
+
+            hdc = GetDC(infoPtr->hLrgWnd);
+            lf.lfHeight = GetDeviceCaps(hdc,
+                                        LOGPIXELSY) / 2;
+            ReleaseDC(infoPtr->hLrgWnd,
+                      hdc);
+
+            lf.lfCharSet =  DEFAULT_CHARSET;
+            wcscpy(lf.lfFaceName,
+                   lpFontName);
+
+            hFont = CreateFontIndirectW(&lf);
+
+            HeapFree(GetProcessHeap(),
+                     0,
+                     lpFontName);
+        }
+    }
+
+    return hFont;
+}
+
+
+LRESULT CALLBACK
+LrgCellWndProc(HWND hwnd,
+               UINT uMsg,
+               WPARAM wParam,
+               LPARAM lParam)
+{
+    PMAP infoPtr;
+    LRESULT Ret = 0;
+    static INT cxClient, cyClient;
+    static RECT rc;
+    static HFONT hFont = NULL;
+
+    infoPtr = (PMAP)GetWindowLongPtrW(hwnd,
+                                     GWLP_USERDATA);
+
+    if (infoPtr == NULL && uMsg != WM_CREATE)
+    {
+        goto HandleDefaultMessage;
+    }
+
+    switch (uMsg)
+    {
+        case WM_CREATE:
+        {
+            infoPtr = (PMAP)(((LPCREATESTRUCTW)lParam)->lpCreateParams);
+
+            SetWindowLongPtrW(hwnd,
+                              GWLP_USERDATA,
+                              (LONG_PTR)infoPtr);
+
+            hFont = SetLrgFont(infoPtr);
+
+            break;
+        }
+
+        case WM_SIZE:
+        {
+            cxClient = LOWORD(lParam);
+            cyClient = HIWORD(lParam);
+
+            rc.left = 0;
+            rc.top = 0;
+            rc.right = cxClient;
+            rc.bottom = cyClient;
+
+            break;
+        }
+
+        case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+            HDC hdc;
+            HFONT hOldFont;
+
+            hdc = BeginPaint(hwnd,
+                             &ps);
+
+            Rectangle(hdc,
+                      0,
+                      0,
+                      cxClient,
+                      cyClient);
+
+            hOldFont = SelectObject(hdc, hFont);
+
+            DrawTextW(hdc,
+                      &infoPtr->pActiveCell->ch,
+                      1,
+                      &rc,
+                      DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+
+            SelectObject(hdc, hOldFont);
+
+            EndPaint(hwnd,
+                     &ps);
+
+            break;
+        }
+
+        case WM_DESTROY:
+        {
+            DeleteObject(hFont);
+
+            break;
+        }
+
+        default:
+        {
+HandleDefaultMessage:
+            Ret = DefWindowProcW(hwnd,
+                                 uMsg,
+                                 wParam,
+                                 lParam);
+            break;
+        }
+    }
+
+    return Ret;
+}

base/applications/charmap/precomp.h

@@ -1,57 +1,57 @@
-#ifndef __CHARMAP_PRECOMP_H
-#define __CHARMAP_PRECOMP_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-#include <commctrl.h>
-#include "resource.h"
-
-#define XCELLS 20
-#define YCELLS 10
-#define XLARGE 45
-#define YLARGE 25
-
-#define FM_SETFONT (WM_USER + 1)
-#define FM_GETCHAR (WM_USER + 2)
-#define FM_SETCHAR (WM_USER + 3)
-
-extern HINSTANCE hInstance;
-
-typedef struct _CELL
-{
-    RECT CellExt;
-    RECT CellInt;
-    BOOL bActive;
-    BOOL bLarge;
-    WCHAR ch;
-} CELL, *PCELL;
-
-typedef struct _MAP
-{
-    HWND hMapWnd;
-    HWND hParent;
-    HWND hLrgWnd;
-    SIZE ClientSize;
-    SIZE CellSize;
-    CELL Cells[YCELLS][XCELLS];
-    PCELL pActiveCell;
-    HFONT hFont;
-    LOGFONTW CurrentFont;
-    INT iYStart;
-} MAP, *PMAP;
-
-typedef struct {
-    NMHDR hdr;
-    WCHAR ch;
-} MAPNOTIFY, *LPMAPNOTIFY;
-
-
-LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-VOID ShowAboutDlg(HWND hWndParent);
-
-BOOL RegisterMapClasses(HINSTANCE hInstance);
-VOID UnregisterMapClasses(HINSTANCE hInstance);
-
-#endif /* __CHARMAP_PRECOMP_H */
+#ifndef __CHARMAP_PRECOMP_H
+#define __CHARMAP_PRECOMP_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
+#include <commctrl.h>
+#include "resource.h"
+
+#define XCELLS 20
+#define YCELLS 10
+#define XLARGE 45
+#define YLARGE 25
+
+#define FM_SETFONT (WM_USER + 1)
+#define FM_GETCHAR (WM_USER + 2)
+#define FM_SETCHAR (WM_USER + 3)
+
+extern HINSTANCE hInstance;
+
+typedef struct _CELL
+{
+    RECT CellExt;
+    RECT CellInt;
+    BOOL bActive;
+    BOOL bLarge;
+    WCHAR ch;
+} CELL, *PCELL;
+
+typedef struct _MAP
+{
+    HWND hMapWnd;
+    HWND hParent;
+    HWND hLrgWnd;
+    SIZE ClientSize;
+    SIZE CellSize;
+    CELL Cells[YCELLS][XCELLS];
+    PCELL pActiveCell;
+    HFONT hFont;
+    LOGFONTW CurrentFont;
+    INT iYStart;
+} MAP, *PMAP;
+
+typedef struct {
+    NMHDR hdr;
+    WCHAR ch;
+} MAPNOTIFY, *LPMAPNOTIFY;
+
+
+LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+VOID ShowAboutDlg(HWND hWndParent);
+
+BOOL RegisterMapClasses(HINSTANCE hInstance);
+VOID UnregisterMapClasses(HINSTANCE hInstance);
+
+#endif /* __CHARMAP_PRECOMP_H */

base/applications/charmap/resource.h

@@ -1,19 +1,19 @@
-#define IDC_STATIC       -1
-
-#define IDI_ICON         100
-
-#define IDD_CHARMAP      200
-#define IDD_ABOUTBOX     201
-
-#define IDC_FONTCOMBO    1001
-#define IDC_CMHELP       1002
-#define IDC_FONTMAP      1003
-#define IDC_TEXTBOX      1004
-#define IDC_SELECT       1005
-#define IDC_COPY         1006
-#define IDC_ADVVIEW      1007
-#define IDC_DISPLAY      1008
-#define IDC_LICENSE_EDIT 1009
-
-#define IDS_LICENSE      1010
-#define IDS_ABOUT        1011
+#define IDC_STATIC -1
+
+#define IDI_ICON 100
+
+#define IDD_CHARMAP 200
+#define IDD_ABOUTBOX 201
+
+#define IDC_FONTCOMBO 1001
+#define IDC_CMHELP 1002
+#define IDC_FONTMAP 1003
+#define IDC_TEXTBOX 1004
+#define IDC_SELECT 1005
+#define IDC_COPY 1006
+#define IDC_ADVVIEW 1007
+#define IDC_DISPLAY 1008
+#define IDC_LICENSE_EDIT 1009
+
+#define IDS_LICENSE 1010
+#define IDS_ABOUT   1011

base/applications/charmap/rsrc.rc

@@ -8,22 +8,19 @@ IDI_ICON ICON "res/charmap.ico"
 #include "lang/bg-BG.rc"
 #include "lang/ca-ES.rc"
 #include "lang/cs-CZ.rc"
-#include "lang/de-DE.rc"
-#include "lang/el-GR.rc"
 #include "lang/en-US.rc"
+#include "lang/de-DE.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
+#include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
-#include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/pt-BR.rc"
-#include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"
-#include "lang/zh-CN.rc"
-#include "lang/zh-TW.rc"
+#include "lang/ru-RU.rc"
+#include "lang/el-GR.rc"

base/applications/cmdutils/cmdutils.rbuild

@@ -13,15 +13,9 @@
 	<directory name="hostname">
 		<xi:include href="hostname/hostname.rbuild" />
 	</directory>
-	<directory name="lodctr">
-		<xi:include href="lodctr/lodctr.rbuild" />
-	</directory>
 	<directory name="more">
 		<xi:include href="more/more.rbuild" />
 	</directory>
-	<directory name="reg">
-		<xi:include href="reg/reg.rbuild" />
-	</directory>
 	<directory name="xcopy">
 		<xi:include href="xcopy/xcopy.rbuild" />
 	</directory>

base/applications/cmdutils/dbgprint/dbgprint.c

@@ -5,13 +5,11 @@
  * FILE:            tools/dbgprint/dbgprint.c
  * PURPOSE:         outputs a text via DbgPrint API
  * PROGRAMMERS:     Johannes Anderwald (johannes.anderwald@student.tugraz.at)
- *                  Christoph von Wittich (Christoph_vW@ReactOS.org)
  */
 
 #include <windows.h>
 #include <tchar.h>
 #include <debug.h>
-#include <stdio.h>
 
 int _tmain(int argc, TCHAR ** argv)
 {
@@ -31,93 +29,30 @@ int _tmain(int argc, TCHAR ** argv)
 		return -1;
 	}
 
-	if (_tcsstr(argv[1], "--winetest") && (argc == 3))
+	buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR));
+	if (!buf)
 	{
-		char   psBuffer[128];
-		char   psBuffer2[128];
-		char   *nlptr2;
-		char   cmd[255];
-		char   test[300];
-		FILE   *pPipe;
-		FILE   *pPipe2;
-
-		/* get available tests */
-		pPipe = _tpopen(argv[2], "r");
-		if (pPipe != NULL)
-		{
-			while(fgets(psBuffer, 128, pPipe))
-			{
-				if (psBuffer[0] == ' ')
-				{
-					strcpy(cmd, argv[2]);
-					strcat(cmd, " ");
-					strcat(cmd, psBuffer+4);
-					/* run the current test */
-					strcpy(test, "\n\nRunning ");
-					strcat(test, cmd);
-					OutputDebugStringA(test);
-					pPipe2 = _popen(cmd, "r");
-					if (pPipe2 != NULL)
-					{
-						while(fgets(psBuffer2, 128, pPipe2))
-						{
-							nlptr2 = strchr(psBuffer2, '\n');
-							if (nlptr2)
-								*nlptr2 = '\0';
-							puts(psBuffer2);
-							OutputDebugStringA(psBuffer2);
-						}
-						_pclose(pPipe2);
-					}
-				}
-			}
-			_pclose(pPipe);
-		}
+		return -1;
 	}
-	else if (_tcsstr(argv[1], "--process") && (argc == 3))
+
+	offset = 0;
+	for(i = 1; i < argc; i++)
 	{
-		char   psBuffer[128];
-		FILE   *pPipe;
-
-		pPipe = _tpopen(argv[2], "r");
-		if (pPipe != NULL)
+		int length = _tcslen(argv[i]);
+		_tcsncpy(&buf[offset], argv[i], length);
+		offset += length;
+		if (i + 1 < argc)
 		{
-			while(fgets(psBuffer, 128, pPipe))
-			{
-				puts(psBuffer);
-				OutputDebugStringA(psBuffer);
-			}
-			_pclose(pPipe);
+			buf[offset] = _T(' ');
 		}
+		else
+		{
+			buf[offset] = _T('\n');
+			buf[offset+1] = _T('\0');
+		}
+		offset++;
 	}
-	else
-	{
-		buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR));
-		if (!buf)
-		{
-			return -1;
-		}
-
-		offset = 0;
-		for(i = 1; i < argc; i++)
-		{
-			int length = _tcslen(argv[i]);
-			_tcsncpy(&buf[offset], argv[i], length);
-			offset += length;
-			if (i + 1 < argc)
-			{
-				buf[offset] = _T(' ');
-			}
-			else
-			{
-				buf[offset] = _T('\n');
-				buf[offset+1] = _T('\0');
-			}
-			offset++;
-		}
-		_putts(buf);
-		OutputDebugString(buf);
-		HeapFree(GetProcessHeap(), 0, buf);
-	}
+	OutputDebugString(buf);
+	HeapFree(GetProcessHeap(), 0, buf);
 	return 0;
 }

base/applications/cmdutils/dbgprint/dbgprint.rbuild

@@ -1,5 +1,8 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
-	<file>dbgprint.c</file>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
+	<file>dbgprint.c</file>
+</module>

base/applications/cmdutils/doskey/doskey.c

@@ -1,125 +1,80 @@
 #include <windows.h>
 #include <stdio.h>
 #include <tchar.h>
-#include "doskey.h"
 
-#define MAX_STRING 2000
-TCHAR szStringBuf[MAX_STRING];
-LPTSTR pszExeName = _T("cmd.exe");
-
-static VOID SetInsert(DWORD dwFlag)
+static VOID
+partstrlwr (LPTSTR str)
 {
-    DWORD dwMode;
-    HANDLE hConsole = GetStdHandle(STD_INPUT_HANDLE);
-    GetConsoleMode(hConsole, &dwMode);
-    dwMode |= ENABLE_EXTENDED_FLAGS;
-    SetConsoleMode(hConsole, (dwMode & ~ENABLE_INSERT_MODE) | dwFlag);
-}
-
-static VOID PrintHistory(VOID)
-{
-    DWORD Length = GetConsoleCommandHistoryLength(pszExeName);
-    DWORD BufferLength;
-    PBYTE HistBuf;
-    TCHAR *Hist;
-    TCHAR *HistEnd;
-
-    /* On Windows, the ANSI version of GetConsoleCommandHistory requires
-     * a buffer twice as large as the actual history length. */
-    BufferLength = Length * (sizeof(WCHAR) / sizeof(TCHAR)) * sizeof(BYTE);
-
-    HistBuf = HeapAlloc(GetProcessHeap(),
-                        HEAP_ZERO_MEMORY,
-                        BufferLength);
-    if (!HistBuf) return;
-    Hist = (TCHAR *)HistBuf;
-    HistEnd = (TCHAR *)&HistBuf[Length];
-
-    if (GetConsoleCommandHistory(Hist, BufferLength, pszExeName))
-        for (; Hist < HistEnd; Hist += _tcslen(Hist) + 1)
-            _tprintf(_T("%s\n"), Hist);
-
-    HeapFree(GetProcessHeap(), 0, HistBuf);
-}
-
-static INT SetMacro(LPTSTR definition)
-{
-    TCHAR *name, *nameend, *text, temp;
-
-    name = definition;
-    while (*name == _T(' '))
-        name++;
-
-    /* error if no '=' found */
-    if ((nameend = _tcschr(name, _T('='))) != NULL)
+    LPTSTR c = str;
+    while (*c && !_istspace (*c) && *c != _T('='))
     {
-        text = nameend + 1;
-        while (*text == _T(' '))
-            text++;
-
-        while (nameend > name && nameend[-1] == _T(' '))
-            nameend--;
-
-        /* Split rest into name and substitute */
-        temp = *nameend;
-        *nameend = _T('\0');
-        /* Don't allow spaces in the name, since such a macro would be unusable */
-        if (!_tcschr(name, _T(' ')) && AddConsoleAlias(name, text, pszExeName))
-            return 0;
-        *nameend = temp;
+        *c = _totlower (*c);
+        c++;
     }
-
-    LoadString(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING);
-    _tprintf(szStringBuf, definition);
-    return 1;
 }
 
-static VOID PrintMacros(LPTSTR pszExeName, LPTSTR Indent)
+static VOID
+PrintAlias (VOID)
 {
-    DWORD Length = GetConsoleAliasesLength(pszExeName);
-    PBYTE AliasBuf;
-    TCHAR *Alias;
-    TCHAR *AliasEnd;
+    LPTSTR Aliases;
+    LPTSTR ptr;
+    DWORD len;
 
-    AliasBuf = HeapAlloc(GetProcessHeap(),
-                         HEAP_ZERO_MEMORY,
-                         Length * sizeof(BYTE));
-    if (!AliasBuf) return;
-    Alias = (TCHAR *)AliasBuf;
-    AliasEnd = (TCHAR *)&AliasBuf[Length];
+    len = GetConsoleAliasesLength(_T("cmd.exe"));
+    if (len <= 0)
+        return;
 
-    if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName))
-        for (; Alias < AliasEnd; Alias += _tcslen(Alias) + 1)
-            _tprintf(_T("%s%s\n"), Indent, Alias);
+    /* allocate memory for an extra \0 char to make parsing easier */
+    ptr = HeapAlloc(GetProcessHeap(), 0, (len + sizeof(TCHAR)));
+    if (!ptr)
+        return;
 
-    HeapFree(GetProcessHeap(), 0, AliasBuf);
-}
+    Aliases = ptr;
 
-static VOID PrintAllMacros(VOID)
-{
-    DWORD Length = GetConsoleAliasExesLength();
-    PBYTE ExeNameBuf;
-    TCHAR *ExeName;
-    TCHAR *ExeNameEnd;
+    ZeroMemory(Aliases, len + sizeof(TCHAR));
 
-    ExeNameBuf = HeapAlloc(GetProcessHeap(),
-                           HEAP_ZERO_MEMORY,
-                           Length * sizeof(BYTE));
-    if (!ExeNameBuf) return;
-    ExeName = (TCHAR *)ExeNameBuf;
-    ExeNameEnd = (TCHAR *)&ExeNameBuf[Length];
-
-    if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE)))
+    if (GetConsoleAliases(Aliases, len, _T("cmd.exe")) != 0)
     {
-        for (; ExeName < ExeNameEnd; ExeName += _tcslen(ExeName) + 1)
+        while (*Aliases != '\0')
         {
-            _tprintf(_T("[%s]\n"), ExeName);
-            PrintMacros(ExeName, _T("    "));
-            _tprintf(_T("\n"));
+            _tprintf(_T("%s\n"), Aliases);
+            Aliases = Aliases + lstrlen(Aliases);
+            Aliases++;
         }
     }
+    HeapFree(GetProcessHeap(), 0 , ptr);
+}
 
-    HeapFree(GetProcessHeap(), 0, ExeNameBuf);
+INT SetMacro (LPTSTR param)
+{
+    LPTSTR ptr;
+
+    while (*param == _T(' '))
+        param++;
+
+    /* error if no '=' found */
+    if ((ptr = _tcschr (param, _T('='))) == 0)
+        return 1;
+
+    while (*param == _T(' '))
+        param++;
+
+    while (*ptr == _T(' '))
+        ptr--;
+
+    /* Split rest into name and substitute */
+    *ptr++ = _T('\0');
+
+    partstrlwr (param);
+
+    _tprintf(_T("%s, %s\n"), ptr, param);
+
+    if (ptr[0] == _T('\0'))
+        AddConsoleAlias(param, NULL, _T("cmd.exe"));
+    else
+        AddConsoleAlias(param, ptr, _T("cmd.exe"));
+
+    return 0;
 }
 
 static VOID ReadFromFile(LPTSTR param)
@@ -127,140 +82,57 @@ static VOID ReadFromFile(LPTSTR param)
     FILE* fp;
     TCHAR line[MAX_PATH];
 
+    /* Skip the "/macrofile=" prefix */
+    param += 11;
+
     fp = _tfopen(param, _T("r"));
-    if (!fp)
-    {
-#ifdef UNICODE
-        _wperror(param);
-#else
-        perror(param);
-#endif
-        return;
-    }
 
     while ( _fgetts(line, MAX_PATH, fp) != NULL) 
-    {
-        /* Remove newline character */
-        TCHAR *end = &line[_tcslen(line) - 1];
-        if (*end == _T('\n'))
-            *end = _T('\0');
-
-        if (*line)
-            SetMacro(line);
-    }
+        SetMacro(line);
 
     fclose(fp);
     return;
 }
 
-/* Get the start and end of the next command-line argument. */
-static BOOL GetArg(TCHAR **pStart, TCHAR **pEnd)
-{
-    BOOL bInQuotes = FALSE;
-    TCHAR *p = *pEnd;
-    p += _tcsspn(p, _T(" \t"));
-    if (!*p)
-        return FALSE;
-    *pStart = p;
-    do
-    {
-        if (!bInQuotes && (*p == _T(' ') || *p == _T('\t')))
-            break;
-        bInQuotes ^= (*p++ == _T('"'));
-    } while (*p);
-    *pEnd = p;
-    return TRUE;
-}
-
-/* Remove starting and ending quotes from a string, if present */
-static LPTSTR RemoveQuotes(LPTSTR str)
-{
-    TCHAR *end;
-    if (*str == _T('"') && *(end = str + _tcslen(str) - 1) == _T('"'))
-    {
-        str++;
-        *end = _T('\0');
-    }
-    return str;
-}
-
 int
-_tmain(VOID)
+_tmain (int argc, LPTSTR argv[])
 {
-    /* Get the full command line using GetCommandLine(). We can't just use argv,
-     * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */
-    TCHAR *pArgStart;
-    TCHAR *pArgEnd = GetCommandLine();
+    if (argc < 2)
+        return 0;
 
-    /* Skip the application name */
-    GetArg(&pArgStart, &pArgEnd);
-
-    while (GetArg(&pArgStart, &pArgEnd))
+    if (argv[1][0] == '/')
     {
-        /* NUL-terminate this argument to make processing easier */
-        TCHAR tmp = *pArgEnd;
-        *pArgEnd = _T('\0');
+        if (_tcsnicmp(argv[1], _T("/macrofile"), 10) == 0)
+            ReadFromFile(argv[1]);
+        if (_tcscmp(argv[1], _T("/macros")) == 0)
+            PrintAlias();
+    }
+    else
+    {
+        /* Get the full command line using GetCommandLine().
+           We can't just pass argv[1] here, because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */
+        TCHAR* szCommandLine = GetCommandLine();
 
-        if (!_tcscmp(pArgStart, _T("/?")))
+        /* Skip the application name */
+        if(*szCommandLine == '\"')
         {
-            LoadString(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING);
-            _tprintf(szStringBuf);
-            break;
-        }
-        else if (!_tcsnicmp(pArgStart, _T("/EXENAME="), 9))
-        {
-            pszExeName = RemoveQuotes(pArgStart + 9);
-        }
-        else if (!_tcsicmp(pArgStart, _T("/H")) ||
-                 !_tcsicmp(pArgStart, _T("/HISTORY")))
-        {
-            PrintHistory();
-        }
-        else if (!_tcsnicmp(pArgStart, _T("/LISTSIZE="), 10))
-        {
-            SetConsoleNumberOfCommands(_ttoi(pArgStart + 10), pszExeName);
-        }
-        else if (!_tcsicmp(pArgStart, _T("/REINSTALL")))
-        {
-            ExpungeConsoleCommandHistory(pszExeName);
-        }
-        else if (!_tcsicmp(pArgStart, _T("/INSERT")))
-        {
-            SetInsert(ENABLE_INSERT_MODE);
-        }
-        else if (!_tcsicmp(pArgStart, _T("/OVERSTRIKE")))
-        {
-            SetInsert(0);
-        }
-        else if (!_tcsicmp(pArgStart, _T("/M")) ||
-                 !_tcsicmp(pArgStart, _T("/MACROS")))
-        {
-            PrintMacros(pszExeName, _T(""));
-        }
-        else if (!_tcsnicmp(pArgStart, _T("/M:"),      3) ||
-                 !_tcsnicmp(pArgStart, _T("/MACROS:"), 8))
-        {
-            LPTSTR exe = RemoveQuotes(_tcschr(pArgStart, _T(':')) + 1);
-            if (!_tcsicmp(exe, _T("ALL")))
-                PrintAllMacros();
-            else
-                PrintMacros(exe, _T(""));
-        }
-        else if (!_tcsnicmp(pArgStart, _T("/MACROFILE="), 11))
-        {
-            ReadFromFile(RemoveQuotes(pArgStart + 11));
+            do
+            {
+                szCommandLine++;
+            }
+            while(*szCommandLine != '\"');
         }
         else
         {
-            /* This is the beginning of a macro definition. It includes
-             * the entire remainder of the line, so first put back the
-             * character that we replaced with NUL. */
-            *pArgEnd = tmp;
-            return SetMacro(pArgStart);
+            do
+            {
+                szCommandLine++;
+            }
+            while(*szCommandLine != ' ');
         }
 
-        if (!tmp) break;
-        pArgEnd++;
+        /* Skip the trailing quotation mark/whitespace and pass the command line to SetMacro */
+        SetMacro(++szCommandLine);
     }
 
     return 0;

base/applications/cmdutils/doskey/doskey.h

@@ -1,67 +0,0 @@
-#define IDS_HELP 0
-#define IDS_INVALID_MACRO_DEF 1
-
-#ifndef RC_INVOKED
-
-#ifdef UNICODE
-#define TNAME(x) x##W
-#else
-#define TNAME(x) x##A
-#endif
-
-/* Missing from include/psdk/wincon.h */
-#ifndef ENABLE_INSERT_MODE
-#define ENABLE_INSERT_MODE 0x20
-#endif
-#ifndef ENABLE_EXTENDED_FLAGS
-#define ENABLE_EXTENDED_FLAGS 0x80
-#endif
-
-/* Undocumented APIs */
-#ifndef AddConsoleAlias
-BOOL WINAPI AddConsoleAliasA(LPSTR, LPSTR, LPSTR);
-BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR);
-#define AddConsoleAlias TNAME(AddConsoleAlias)
-#endif
-#ifndef ExpungeConsoleCommandHistory
-BOOL WINAPI ExpungeConsoleCommandHistoryA(LPSTR);
-BOOL WINAPI ExpungeConsoleCommandHistoryW(LPWSTR);
-#define ExpungeConsoleCommandHistory TNAME(ExpungeConsoleCommandHistory)
-#endif
-#ifndef GetConsoleAliases
-DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR);
-DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR);
-#define GetConsoleAliases TNAME(GetConsoleAliases)
-#endif
-#ifndef GetConsoleAliasesLength
-DWORD WINAPI GetConsoleAliasesLengthA(LPSTR); 
-DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR); 
-#define GetConsoleAliasesLength TNAME(GetConsoleAliasesLength)
-#endif
-#ifndef GetConsoleAliasExes
-DWORD WINAPI GetConsoleAliasExesA(LPSTR, DWORD);
-DWORD WINAPI GetConsoleAliasExesW(LPWSTR, DWORD);
-#define GetConsoleAliasExes TNAME(GetConsoleAliasExes)
-#endif
-#ifndef GetConsoleAliasExesLength
-DWORD WINAPI GetConsoleAliasExesLengthA(VOID);
-DWORD WINAPI GetConsoleAliasExesLengthW(VOID);
-#define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength)
-#endif
-#ifndef GetConsoleCommandHistory
-DWORD WINAPI GetConsoleCommandHistoryA(LPSTR, DWORD, LPSTR);
-DWORD WINAPI GetConsoleCommandHistoryW(LPWSTR, DWORD, LPWSTR);
-#define GetConsoleCommandHistory TNAME(GetConsoleCommandHistory)
-#endif
-#ifndef GetConsoleCommandHistoryLength
-DWORD WINAPI GetConsoleCommandHistoryLengthA(LPSTR);
-DWORD WINAPI GetConsoleCommandHistoryLengthW(LPWSTR);
-#define GetConsoleCommandHistoryLength TNAME(GetConsoleCommandHistoryLength)
-#endif
-#ifndef SetConsoleNumberOfCommands
-BOOL WINAPI SetConsoleNumberOfCommandsA(DWORD, LPSTR);
-BOOL WINAPI SetConsoleNumberOfCommandsW(DWORD, LPWSTR);
-#define SetConsoleNumberOfCommands TNAME(SetConsoleNumberOfCommands)
-#endif
-
-#endif /* RC_INVOKED */

base/applications/cmdutils/doskey/doskey.rbuild

@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes">
-	<library>user32</library>
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
 	<file>doskey.c</file>
 	<file>doskey.rc</file>
 </module>

base/applications/cmdutils/doskey/doskey.rc

@@ -1,12 +1,7 @@
+/* $Id: find.rc 28350 2007-08-15 14:46:36Z fireball $ */
+
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 doskey command\0"
 #define REACTOS_STR_INTERNAL_NAME	"doskey\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"doskey.exe\0"
 #include <reactos/version.rc>
 
-#include <windows.h>
-#include "doskey.h"
-
-#include "lang/bg-BG.rc"
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/uk-UA.rc"

base/applications/cmdutils/doskey/lang/bg-BG.rc

@@ -1,27 +0,0 @@
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-\n\
-DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]\n\
-       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=<3D><><EFBFBD><EFBFBD>] [macroname=[<5B><><EFBFBD><EFBFBD><EFBFBD>]]\n\
-\n\
-  /INSERT             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /OVERSTRIKE         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /EXENAME=<3D><><EFBFBD><EFBFBD><EFBFBD>exe   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                      <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> cmd.exe.\n\
-  /HISTORY            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /LISTSIZE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>      <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /REINSTALL          <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS:<3A><><EFBFBD><EFBFBD><EFBFBD>exe     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS:ALL         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROFILE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>.\n\
-  macroname           <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  text                <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-
-IDS_INVALID_MACRO_DEF, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %s\n"
-
-END

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

@@ -1,28 +0,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "Verwaltet Einstellungen, Verlauf und Makros der Kommandozeile.\n\
-\n\
-DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
-       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\
-\n\
-  /INSERT             Aktiviert den Einfügemodus.\n\
-  /OVERSTRIKE         Deaktiviert den Einfügemodus.\n\
-  /EXENAME=exename    Legt den Namen der Anwendung, auf die die Einstel-\n\
-                      lungen angewendet werden sollen, fest. Der Standard-\n\
-                      wert ist cmd.exe.\n\
-  /HISTORY            Zeigt den Befehlsverlauf an.\n\
-  /LISTSIZE=size      Legt die Anzahl der Befehle per Verlaufspuffer fest.\n\
-  /REINSTALL          Leert den Befehlsverlauf.\n\
-  /MACROS             Zeigt Makrodefinitionen an.\n\
-  /MACROS:exename     Zeigt Makrodefinitionen für eine Anwendung an.\n\
-  /MACROS:ALL         Zeigt Makrodefinitionen für alle Anwendungen an.\n\
-  /MACROFILE=file     Lädt Makrodefinitionen aus einer Datei.\n\
-  macroname           Legt den Namen eines zu erstellenden Makros fest.\n\
-  text                Legt den ersetzenden Text des Makros fest.\n"
-
-IDS_INVALID_MACRO_DEF, "Ungültige Makrodefinition: %s\n"
-
-END

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

@@ -1,27 +0,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "Manages command-line editing settings, history, and macros.\n\
-\n\
-DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
-       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\
-\n\
-  /INSERT             Enables insert mode.\n\
-  /OVERSTRIKE         Disables insert mode.\n\
-  /EXENAME=exename    Sets the name of the program to view/change history\n\
-                      and macros for. The default is cmd.exe.\n\
-  /HISTORY            Displays the command history.\n\
-  /LISTSIZE=size      Sets the number of commands per history buffer.\n\
-  /REINSTALL          Clears the command history.\n\
-  /MACROS             Displays macro definitions.\n\
-  /MACROS:exename     Displays macro definitions for a specific program.\n\
-  /MACROS:ALL         Displays macro definitions for all programs.\n\
-  /MACROFILE=file     Loads macro definitions from a file.\n\
-  macroname           Specifies the name of a macro to create.\n\
-  text                Specifies the replacement text for the macro.\n"
-
-IDS_INVALID_MACRO_DEF, "Invalid macro definition: %s\n"
-
-END

base/applications/cmdutils/doskey/lang/uk-UA.rc

@@ -1,35 +0,0 @@
-/*
- * PROJECT:     ReactOS DOSKey
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/cmdutils/doskey/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for ReactOS DOSKey
- * TRANSLATOR:  Sakara Yevhen
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-\n\
-DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
-       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\
-\n\
-  /INSERT             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /OVERSTRIKE         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /EXENAME=exename    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                      <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cmd.exe.\n\
-  /HISTORY            ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /LISTSIZE=size      <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /REINSTALL          <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS             ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS:exename     ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS:ALL         ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROFILE=filename <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
-  macroname           <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  text                <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-
-IDS_INVALID_MACRO_DEF, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
-
-END

base/applications/cmdutils/find/find.c

@@ -15,9 +15,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 

base/applications/cmdutils/find/find.rbuild

@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="find" type="win32cui" installbase="system32" installname="find.exe">
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>kernel32</library>
 	<library>user32</library>
 	<file>find.c</file>
 	<file>find.rc</file>

base/applications/cmdutils/find/lang/it-IT.rc

@@ -1,17 +1,17 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"stringa\" [ file... ]\n\
-    /C  Conta il numero di linee che contengono la stringa\n\
-    /I  Ignora maiuscole/minuscole\n\
-    /N  Numera le linee visualizzate a partire da 1\n\
-    /V  Visualizza le linee che non contengono la stringa"
-
-IDS_NO_SUCH_FILE, "FIND: %s: File non trovato\n"
-
-IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n"
-
-END
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"stringa\" [ file... ]\n\
+    /C  Conta il numero di linee che contengono la stringa\n\
+    /I  Ignora maiuscole/minuscole\n\
+    /N  Numera le linee visualizzate a partire da 1\n\
+    /V  Visualizza le linee che non contengono la stringa"
+
+IDS_NO_SUCH_FILE, "FIND: %s: File non trovato\n"
+
+IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n"
+
+END

base/applications/cmdutils/find/lang/lt-LT.rc

@@ -1,26 +1,26 @@
-/*
- * PROJECT:     ReactOS find command
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/cmdutils/find/lang/lt-LT.rc
- * PURPOSE:     Lithuanian Language File
- * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
- * DATE:        2007-09-23
- */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ie<69>komas tekstas.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"tekstas\" [ byla... ]\n\
-    /C  Skai<61>iuoti eilutes, kuriose yra ie<69>komas tekstas\n\
-    /I  Ignoruoti raid<69>i<EFBFBD> dyd<79>\n\
-    /N  Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\
-    /V  Spausdinti eilutes, kuriose n<>ra ie<69>komo teksto"
-
-IDS_NO_SUCH_FILE, "FIND: %s: Tokios bylos n<>ra\n"
-
-IDS_CANNOT_OPEN, "FIND: %s: Nepavyko atverti bylos\n"
-
-END
+/*
+ * PROJECT:     ReactOS find command
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/find/lang/lt-LT.rc
+ * PURPOSE:     Lithuanian Language File
+ * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
+ * DATE:        2007-09-23
+ */
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ie<69>komas tekstas.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"tekstas\" [ byla... ]\n\
+    /C  Skai<61>iuoti eilutes, kuriose yra ie<69>komas tekstas\n\
+    /I  Ignoruoti raid<69>i<EFBFBD> dyd<79>\n\
+    /N  Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\
+    /V  Spausdinti eilutes, kuriose n<>ra ie<69>komo teksto"
+
+IDS_NO_SUCH_FILE, "FIND: %s: Tokios bylos n<>ra\n"
+
+IDS_CANNOT_OPEN, "FIND: %s: Nepavyko atverti bylos\n"
+
+END

base/applications/cmdutils/find/lang/no-NO.rc

@@ -1,17 +0,0 @@
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_USAGE, "FINN: Skriv alle linjene for filen som inneholder en streng.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"streng\" [ fil... ]\n\
-    /C  Teller nummer av linjer som inneholder strenger\n\
-    /I  Ignorere sak\n\
-    /N  Nummer viste linjer, start med 1\n\
-    /V  Skriv linjer som ikke inneholder en streng"
-
-IDS_NO_SUCH_FILE, "FINN: %s: Ingen filer\n"
-
-IDS_CANNOT_OPEN, "FINN: %s: Kan ikke <20>pne filen\n"
-
-END

base/applications/cmdutils/find/lang/sv-SE.rc

@@ -1,17 +0,0 @@
-LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_USAGE, "FIND: Skriver ut alla rader i en fil som inneh<65>ller en str<74>ng.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"str<74>ng\" [ fil... ]\n\
-    /C  R<>kna nummren av linjer som inneh<65>ller en str<74>ngen\n\
-    /I  Ignorera skiftl<74>ge\n\
-    /N  Antal visade rader, b<>rjar p<> 1\n\
-    /V  Skriver ut rader som inte inneh<65>ller str<74>ngen"
-
-IDS_NO_SUCH_FILE, "FIND: %s: Ingen sorts fil\n"
-
-IDS_CANNOT_OPEN, "FIND: %s: Kan inte <20>ppna filen\n"
-
-END

base/applications/cmdutils/find/resource.h

@@ -1,3 +1,3 @@
-#define IDS_USAGE                 1000
-#define IDS_NO_SUCH_FILE          1001
-#define IDS_CANNOT_OPEN           1002
+#define IDS_USAGE                 1000
+#define IDS_NO_SUCH_FILE          1001
+#define IDS_CANNOT_OPEN           1002