[CLT2012]

- Fix directory creation in first stage - Avoid relocation of syssetup svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56139
[CLT2012]
2025-10-08 17:32:43 +02:00 · 2012-03-13 09:04:26 +00:00 · 2012-03-13 00:08:45 +00:00 · 2012-03-12 22:50:39 +00:00 · 2012-03-12 16:06:54 +00:00 · 2012-03-11 21:09:16 +00:00
2841 changed files with 145096 additions and 229990 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ if(NOT CMAKE_CROSSCOMPILING)
        endif()
        add_definitions(/Dinline=__inline)
    else()
-        add_compile_flags("-fshort-wchar -Wno-multichar")
+        add_compile_flags("-fshort-wchar")
    endif()

    include_directories(include/host)
@@ -61,7 +61,7 @@ if(NOT CMAKE_CROSSCOMPILING)
    add_subdirectory(lib)

    if(NOT MSVC)
-        export(TARGETS widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+        export(TARGETS widl wrc gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
    else()
        export(TARGETS gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
    endif()
@@ -78,9 +78,6 @@ else()
    #useful stuff!
    include(CMakeParseArguments)
    
-    # this is needed as well
-    link_directories(${REACTOS_SOURCE_DIR}/importlibs)
-    
    if(ENABLE_CCACHE)
        set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
        set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
@@ -147,12 +144,6 @@ else()
    # Activate language support for resource files
    enable_language(RC)

-    # Localization definitions
-    include(cmake/localization.cmake)
-    set(I18N_DEFS "")
-    # This will set I18N_DEFS for later use
-    set_i18n_language(${I18N_LANG})
-
    # Compiler specific definitions and macros
    if(MSVC)
        include(cmake/msvc.cmake)
@@ -231,5 +222,7 @@ else()

    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)

+    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
+
    add_dependency_footer()
 endif()
--- a/633
+++ b/633
@@ -0,0 +1,633 @@
+# Well-known targets:
+#
+#    all (default target)
+#        This target builds all of ReactOS.
+#
+#    module
+#        These targets builds a single module. Replace module with the name of
+#        the module you want to build.
+#
+#    bootcd
+#        This target builds an ISO (ReactOS.iso) from which ReactOS can be booted
+#        and installed.
+#
+#    livecd
+#        This target builds an ISO (ReactOS-Live.iso) from which ReactOS can be
+#        booted, but not installed.
+#
+#    install
+#        This target installs all of ReactOS to a location specified by the
+#        ROS_INSTALL environment variable.
+#
+#    module_install
+#        These targets installs a single module to a location specified by the
+#        ROS_INSTALL environment variable. Replace module with the name of the
+#        module you want to install.
+#
+#    clean
+#        This target cleans (deletes) all files that are generated when building
+#        ReactOS.
+#
+#    module_clean
+#        These targets cleans (deletes) files that are generated when building a
+#        single module. Replace module with the name of the module you want to
+#        clean.
+#
+#    depends
+#        This target does a complete dependency check of the ReactOS codebase.
+#        This can require several minutes to complete. If you only need to check
+#        dependencies for a single or few modules then you can use the
+#        module_depends targets instead. This target can also repair a damaged or
+#        missing makefile-${ROS_ARCH}.auto if needed.
+#
+#    module_depends
+#        These targets do a dependency check of individual modules. Replace module
+#        with the name of the module for which you want to check dependencies.
+#        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:
+#
+#    ROS_ARCH
+#        This variable specifies the name of the architecture to build ReactOS for.
+#        The variable defaults to i386.
+#
+#    ROS_PREFIX
+#        This variable specifies the prefix of the MinGW installation. On Windows
+#        a prefix is usually not needed, but on linux it is usually "mingw32". If
+#        not present and no executable named "gcc" can be found, then the prefix is
+#        assumed to be "mingw32". If your gcc is named i386-mingw32-gcc then set
+#        ROS_PREFIX to i386-mingw32. Don't include the dash (-) before gcc.
+#
+#    ROS_INTERMEDIATE
+#        This variable controls where to put intermediate files. Intermediate
+#        files are generated files that are needed to generate the final
+#        output files. Examples of intermediate files include *.o, *.a, and
+#        *.coff. N.B. Don't put a path separator at the end. The variable
+#        defaults to .\obj-{ROS_ARCH}.
+#
+#    ROS_OUTPUT
+#        This variable controls where to put output files. Output files are
+#        generated files that makes up the result of the build process.
+#        Examples of output files include *.exe, *.dll, and *.sys. N.B. Don't
+#        put a path separator at the end. The variable defaults to .\output-{ROS_ARCH}.
+#
+#    ROS_CDOUTPUT
+#        This variable controls the name of the ReactOS directory on cdrom.
+#        The variable defaults to reactos.
+#        Warning: setting this value may lead to a not bootable/installable cdrom.
+#
+#    ROS_TEMPORARY
+#        This variable controls where to put temporary files. Temporary files
+#        are (usually small) generated files that are needed to generate the
+#        intermediate or final output files. Examples of temporary files include
+#        *.rci (preprocessed .rc files for wrc), *.tmp, and *.exp. N.B. Don't put
+#        a path separator at the end. The variable defaults to {ROS_INTERMEDIATE}
+#        directory.
+#
+#    ROS_INSTALL
+#        This variable controls where to install output files to when using
+#        'make install'. N.B. Don't put a path separator at the end. The variable
+#        defaults to .\{ROS_CDOUTPUT}.
+#
+#    ROS_BUILDMAP
+#        This variable controls if map files are to be generated for executable
+#        output files. Map files have the extension .map. The value can be either
+#        full (to build map files with assembly code), yes (to build map files
+#        without source code) or no (to not build any map files). The variable
+#        defaults to no.
+#
+#    ROS_BUILDNOSTRIP
+#        This variable controls if non-symbol-stripped versions are to be built
+#        of executable output files. Non-symbol-stripped executable output files
+#        have .nostrip added to the filename just before the extension. The value
+#        can be either yes (to build non-symbol-stripped versions of executable
+#        output files) or no (to not build non-symbol-stripped versions of
+#        executable output files). The variable defaults to no.
+#
+#    ROS_LEAN_AND_MEAN
+#        This variable controls if all binaries should be stripped out of useless
+#        data added by GCC/LD as well as of RSYM symbol data. Output binary size
+#        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.
+#            -ps          Generate proxy makefiles in source tree instead of the output tree.
+#            -ud          Disable compilation units.
+#            -r           Input XML
+#
+#    ROS_AUTOMAKE
+#        Alternate name of makefile-${ROS_ARCH}.auto
+#
+#    ROS_BUILDENGINE
+#        The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
+#
+
+# check for versions of make that don't have features we need...
+# the function "eval" is only available in 3.80+, which happens to be the minimum
+# version that has the features we use...
+# THIS CHECK IS BORROWED FROM THE "GMSL" PROJECT, AND IS COVERED BY THE GPL LICENSE
+# YOU CAN FIND OUT MORE ABOUT GMSL - A VERY COOL PROJECT - AT:
+# http://gmsl.sourceforge.net/
+
+__gmsl_have_eval :=
+__gmsl_ignore := $(eval __gmsl_have_eval := T)
+
+ifndef __gmsl_have_eval
+$(error ReactOS's makefiles use GNU Make 3.80+ features, you have $(MAKE_VERSION), you MUST UPGRADE in order to build ReactOS - Sorry)
+endif
+# END of code borrowed from GMSL ( http://gmsl.sourceforge.net/ )
+
+define NL
+
+
+endef
+
+.PHONY: all
+.PHONY: clean
+.PHONY: world
+.PHONY: universe
+
+ifneq ($(ROS_ARCH),)
+  ARCH := $(ROS_ARCH)
+else
+  ARCH := i386
+endif
+
+ifeq ($(ROS_AUTOMAKE),)
+  ROS_AUTOMAKE=makefile-$(ARCH).auto
+endif
+
+all: $(ROS_AUTOMAKE)
+
+
+.SUFFIXES:
+
+ifeq ($(HOST),)
+ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+export OSTYPE = msys
+HOST=mingw32-linux
+HOST_CFLAGS+=-fshort-wchar
+HOST_CPPFLAGS+=-fshort-wchar
+else
+HOST=mingw32-windows
+endif
+else
+HOST=mingw32-linux
+HOST_CFLAGS+=-fshort-wchar
+HOST_CPPFLAGS+=-fshort-wchar
+endif
+endif
+
+# Default to half-verbose mode
+ifeq ($(VERBOSE),no)
+  Q = @
+  HALFVERBOSEECHO = no
+  BUILDNO_QUIET = -q
+else
+ifeq ($(VERBOSE),full)
+  Q =
+  HALFVERBOSEECHO = no
+  BUILDNO_QUIET =
+else
+  Q = @
+  HALFVERBOSEECHO = yes
+  BUILDNO_QUIET = -q
+endif
+endif
+ifeq ($(HOST),mingw32-linux)
+  QUOTE = "
+else
+  QUOTE =
+endif
+ifeq ($(HALFVERBOSEECHO),yes)
+  ECHO_CP      =@echo $(QUOTE)[COPY]     $@$(QUOTE)
+  ECHO_MKDIR   =@echo $(QUOTE)[MKDIR]    $@$(QUOTE)
+  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_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_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)
+  ECHO_CDMAKE  =@echo $(QUOTE)[CDMAKE]   $@$(QUOTE)
+  ECHO_MKHIVE  =@echo $(QUOTE)[MKHIVE]   $@$(QUOTE)
+  ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE)
+  ECHO_TEST    =@echo $(QUOTE)[TEST]     $@$(QUOTE)
+  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_NASM    =
+  ECHO_AR      =
+  ECHO_HOSTAR  =
+  ECHO_WINEBLD =
+  ECHO_WRC     =
+  ECHO_RC      =
+  ECHO_CVTRES  =
+  ECHO_WIDL    =
+  ECHO_BIN2RES =
+  ECHO_IMPLIB  =
+  ECHO_LD      =
+  ECHO_HOSTLD  =
+  ECHO_NM      =
+  ECHO_OBJDUMP =
+  ECHO_RBUILD  =
+  ECHO_RSYM    =
+  ECHO_WMC     =
+  ECHO_NCI     =
+  ECHO_CABMAN  =
+  ECHO_CDMAKE  =
+  ECHO_MKHIVE  =
+  ECHO_REGTESTS=
+  ECHO_TEST    =
+  ECHO_GENDIB  =
+  ECHO_STRIP   =
+  ECHO_RGENSTAT=
+  ECHO_DEPENDS =
+  ECHO_RSP     =
+endif
+
+# Set host compiler/linker
+ifeq ($(HOST_CC),)
+  HOST_CC = gcc
+endif
+ifeq ($(HOST_CPP),)
+  HOST_CPP = g++
+endif
+host_gcc = $(Q)$(HOST_CC)
+host_gpp = $(Q)$(HOST_CPP)
+host_ld = $(Q)ld
+host_ar = $(Q)ar
+host_objcopy = $(Q)objcopy
+
+# Set target compiler/linker
+ifneq ($(ROS_PREFIX),)
+  PREFIX_ := $(ROS_PREFIX)-
+else
+  ifeq ($(HOST),mingw32-linux)
+    PREFIX_ := mingw32-
+  else
+    PREFIX_ :=
+  endif
+endif
+ifeq ($(TARGET_CC),)
+  TARGET_CC = $(PREFIX_)gcc
+endif
+ifeq ($(TARGET_CPP),)
+  TARGET_CPP = $(PREFIX_)g++
+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
+ar = $(Q)$(PREFIX_)ar
+objcopy = $(Q)$(PREFIX_)objcopy
+dlltool = $(Q)$(PREFIX_)dlltool
+strip = $(Q)$(PREFIX_)strip
+windres = $(Q)$(PREFIX_)windres
+
+# Set utilities
+ifeq ($(OSTYPE),msys)
+  HOST=mingw32-linux
+endif
+ifeq ($(HOST),mingw32-linux)
+	ifeq ($(OSTYPE),msys)
+		export EXEPOSTFIX = .exe
+	else
+		export EXEPOSTFIX =
+	endif
+	export SEP = /
+	mkdir = -$(Q)mkdir -p
+	checkpoint = $(Q)touch
+	rm = $(Q)rm -f
+	cp = $(Q)cp
+	NUL = /dev/null
+else # mingw32-windows
+	export EXEPOSTFIX = .exe
+	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
+endif
+
+ifneq ($(ROS_INTERMEDIATE),)
+  INTERMEDIATE := $(ROS_INTERMEDIATE)
+else
+  INTERMEDIATE := obj-$(ARCH)
+endif
+INTERMEDIATE_ := $(INTERMEDIATE)$(SEP)
+
+ifneq ($(ROS_OUTPUT),)
+  OUTPUT := $(ROS_OUTPUT)
+else
+  OUTPUT := output-$(ARCH)
+endif
+OUTPUT_ := $(OUTPUT)$(SEP)
+
+ifneq ($(ROS_CDOUTPUT),)
+  CDOUTPUT := $(ROS_CDOUTPUT)
+else
+  CDOUTPUT := reactos
+endif
+CDOUTPUT_ := $(CDOUTPUT)$(SEP)
+
+ifneq ($(ROS_TEMPORARY),)
+  TEMPORARY := $(ROS_TEMPORARY)
+else
+  TEMPORARY := $(INTERMEDIATE)
+endif
+TEMPORARY_ := $(TEMPORARY)$(SEP)
+
+ifneq ($(ROS_INSTALL),)
+  INSTALL := $(ROS_INSTALL)
+else
+  INSTALL := $(CDOUTPUT)
+endif
+INSTALL_ := $(INSTALL)$(SEP)
+
+RBUILD_FLAGS := -rReactOS-$(ARCH).rbuild -DARCH=$(ARCH)
+
+$(INTERMEDIATE):
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(OUTPUT):
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
+ifneq ($(TEMPORARY),$(INTERMEDIATE))
+ifneq ($(TEMPORARY),$(OUTPUT))
+$(TEMPORARY):
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+endif
+
+BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h
+
+include lib/lib.mak
+include tools/tools.mak
+-include $(ROS_AUTOMAKE)
+
+PREAUTO := \
+	$(BIN2C_TARGET) \
+	$(BIN2RES_TARGET) \
+	$(BUILDNO_H) \
+	$(GENDIB_DIB_FILES) \
+	$(NCI_SERVICE_FILES)
+
+ifeq ($(ARCH),powerpc)
+PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS)
+endif
+
+ifeq ($(ROS_BUILDENGINE),)
+ROS_BUILDENGINE=$(RBUILD_TARGET)
+endif
+
+$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(PREAUTO)
+	${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
+
+world: all bootcd livecd
+
+universe:
+	$(MAKE) KDBG=1 DBG=1 \
+		ROS_AUTOMAKE=makefile-$(ARCH)-kd.auto \
+		ROS_INSTALL=reactos-$(ARCH)-kd \
+		ROS_INTERMEDIATE=obj-$(ARCH)-kd \
+		ROS_OUTPUT=output-$(ARCH)-kd \
+		world
+	$(MAKE) KDBG=0 DBG=1 \
+		ROS_AUTOMAKE=makefile-$(ARCH)-d.auto \
+		ROS_INSTALL=reactos-$(ARCH)-d \
+		ROS_INTERMEDIATE=obj-$(ARCH)-d \
+		ROS_OUTPUT=output-$(ARCH)-d \
+		world
+	$(MAKE) KDBG=0 DBG=0 \
+		ROS_AUTOMAKE=makefile-$(ARCH)-r.auto \
+		ROS_INSTALL=reactos-$(ARCH)-r \
+		ROS_INTERMEDIATE=obj-$(ARCH)-r \
+		ROS_OUTPUT=output-$(ARCH)-r \
+		world
+
+.PHONY: rgenstat
+rgenstat: $(RGENSTAT_TARGET)
+	$(ECHO_RGENSTAT)
+	$(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml
+
+.PHONY: msbuild
+msbuild: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msbuild
+
+.PHONY: msbuild_clean
+msbuild_clean: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msbuild
+
+.PHONY: depmap
+depmap: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) depmap
+
+.PHONY: vreport
+vreport:$(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) vreport
+
+.PHONY: msvc
+msvc: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msvc
+
+.PHONY: msvc6
+msvc6: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs6.00 -voversionconfiguration msvc
+
+.PHONY: msvc7
+msvc7: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -voversionconfiguration msvc
+
+.PHONY: msvc71
+msvc71: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -voversionconfiguration msvc
+
+.PHONY: msvc8
+msvc8: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc
+
+.PHONY: msvc9
+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)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc
+
+.PHONY: msvc7_clean
+msvc7_clean: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc
+
+.PHONY: msvc71_clean
+msvc71_clean: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc
+
+.PHONY: msvc8_clean
+msvc8_clean: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc
+
+.PHONY: msvc9_clean
+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)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msvc
+
+.PHONY: msvc_clean_all
+msvc_clean_all: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.10 -voversionconfiguration msvc
+
+.PHONY: msvc7_install_debug
+msvc7_install_debug: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug -voversionconfiguration msvc
+
+.PHONY: msvc7_install_release
+msvc7_install_release: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease -voversionconfiguration msvc
+
+.PHONY: msvc7_install_speed
+msvc7_install_speed: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed -voversionconfiguration msvc
+
+.PHONY: msvc71_install_debug
+msvc71_install_debug: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug -voversionconfiguration msvc
+
+.PHONY: msvc71_install_release
+msvc71_install_release: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease -voversionconfiguration msvc
+
+
+.PHONY: msvc71_install_speed
+msvc71_install_speed: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed -voversionconfiguration msvc
+
+.PHONY: msvc8_install_debug
+msvc8_install_debug: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug -voversionconfiguration msvc
+
+.PHONY: msvc8_install_release
+msvc8_install_release: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease -voversionconfiguration msvc
+
+.PHONY: msvc8_install_speed
+msvc8_install_speed: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed -voversionconfiguration msvc
+
+.PHONY: makefile_auto_clean
+makefile_auto_clean:
+	-@$(rm) $(ROS_AUTOMAKE) $(PREAUTO) 2>$(NUL)
+
+.PHONY: clean
+clean: makefile_auto_clean
+
+.PHONY: depends
+depends: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
--- a/ReactOS-amd64.rbuild
+++ b/ReactOS-amd64.rbuild
@@ -0,0 +1,113 @@
+<?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" />
+	<define name ="NO_UNDERSCORE_PREFIX" />
+
+	<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>
--- a/ReactOS-arm.rbuild
+++ b/ReactOS-arm.rbuild
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" makefile="makefile-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="config-arm.rbuild">
+		<xi:fallback>
+			<xi:include href="config-arm.template.rbuild" />
+		</xi:fallback>
+	</xi:include>
+
+	<xi:include href="ReactOS-generic.rbuild" />
+
+	<!-- <define name="_M_ARM" /> Already defined by toolchain -->
+	<define name="_ARM_" />
+	<define name="__arm__" />
+	<define name="TARGET_arm" host="true" />
+
+	<define name="USE_COMPILER_EXCEPTIONS" />
+
+	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
+
+	<include>include/reactos/arm</include>
+
+	<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>
+
+	<directory name="media">
+		<directory name="nls">
+			<xi:include href="media/nls/nls.rbuild" />
+		</directory>
+	</directory>
+	<directory name="lib">
+		<directory name="drivers">
+			<directory name="csq">
+				<xi:include href="lib/drivers/csq/csq.rbuild" />
+			</directory>
+		</directory>
+		<directory name="cportlib">
+			<xi:include href="lib/cportlib/cportlib.rbuild" />
+		</directory>
+		<directory name="debugsup">
+			<xi:include href="lib/debugsup/debugsup.rbuild" />
+		</directory>
+		<directory name="3rdparty">
+			<directory name="zlib">
+				<xi:include href="lib/3rdparty/zlib/zlib.rbuild" />
+			</directory>
+		</directory>
+		<directory name="rtl">
+			<xi:include href="lib/rtl/rtl.rbuild" />
+		</directory>
+		<directory name="host">
+			<directory name="wcsfuncs">
+				<xi:include href="lib/host/wcsfuncs/wcsfuncs.rbuild" />
+			</directory>
+		</directory>
+		<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>
+		<directory name="pseh">
+			<xi:include href="lib/pseh/pseh.rbuild" />
+		</directory>
+		<directory name="rossym">
+			<xi:include href="lib/rossym/rossym.rbuild" />
+		</directory>
+		<directory name="sdk">
+			<directory name="crt">
+				<xi:include href="lib/sdk/crt/crt.rbuild" />
+				<xi:include href="lib/sdk/crt/libcntpr.rbuild" />
+			</directory>
+			<directory name="ioevent">
+				<xi:include href="lib/sdk/ioevent/ioevent.rbuild" />
+			</directory>
+			<directory name="nt">
+				<xi:include href="lib/sdk/nt/nt.rbuild" />
+			</directory>
+			<directory name="wdmguid">
+				<xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" />
+			</directory>
+		</directory>
+		<directory name="smlib">
+			<xi:include href="lib/smlib/smlib.rbuild" />
+		</directory>
+	</directory>
+	<directory name="include">
+		<xi:include href="include/directory.rbuild" />
+	</directory>
+	<directory name="tools">
+		<xi:include href="tools/tools.rbuild" />
+	</directory>
+	<directory name="ntoskrnl">
+		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
+	</directory>
+	<directory name="hal">
+		<xi:include href="hal/hal.rbuild" />
+	</directory>
+	<directory name="boot">
+		<xi:include href="boot/boot.rbuild" />
+	</directory>
+	<directory name="drivers">
+		<directory name="storage">
+			<directory name="class">
+				<directory name="ramdisk">
+					<xi:include href="drivers/storage/class/ramdisk/ramdisk.rbuild" />
+				</directory>
+			</directory>
+		</directory>
+		<directory name="filesystems">
+			<directory name="fastfat">
+				<xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" />
+			</directory>
+		</directory>
+		<directory name="base">
+			<directory name="kdcom">
+				<xi:include href="drivers/base/kdcom/kdcom.rbuild" />
+			</directory>
+			<directory name="bootvid">
+				<xi:include href="drivers/base/bootvid/bootvid.rbuild" />
+			</directory>
+		</directory>
+	</directory>
+	<directory name="dll">
+		<directory name="ntdll">
+			<xi:include href="dll/ntdll/ntdll.rbuild" />
+		</directory>
+	</directory>
+	<directory name="base">
+		<directory name="system">
+			<directory name="smss">
+				<xi:include href="base/system/smss/smss.rbuild" />
+			</directory>
+		</directory>
+	</directory>
+</project>
--- a/ReactOS-generic.rbuild
+++ b/ReactOS-generic.rbuild
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<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>
+	<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 compilerset="gcc">include/crt/mingw32</include>
+	<include compilerset="msc">include/crt/msc</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 host="true">include/host</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>
+
+</group>
--- a/ReactOS-i386.rbuild
+++ b/ReactOS-i386.rbuild
@@ -0,0 +1,82 @@
+<?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">
+	<xi:include href="config.rbuild">
+		<xi:fallback>
+			<xi:include href="config.template.rbuild" />
+		</xi:fallback>
+	</xi:include>
+
+	<xi:include href="ReactOS-generic.rbuild" />
+
+	<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="PLATFORM" value="PC"/>
+
+	<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="cc,cxx">-fno-omit-frame-pointer</compilerflag>
+		<compilerflag compiler="as">-gstabs+</compilerflag>
+	</group>
+
+	<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>
--- a/ReactOS-ppc.rbuild
+++ b/ReactOS-ppc.rbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" makefile="makefile-ppc.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="config-ppc.rbuild">
+		<xi:fallback>
+			<xi:include href="config-ppc.template.rbuild" />
+		</xi:fallback>
+	</xi:include>
+
+	<xi:include href="ReactOS-generic.rbuild" />
+
+	<property name="MKHIVE_OPTIONS" value="-be" />
+	<property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/>
+	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
+
+	<define name="__MSVCRT__"/>
+	<compilerflag>-fshort-wchar</compilerflag>
+	<compilerflag>-fsigned-char</compilerflag>
+	<compilerflag>-mfull-toc</compilerflag>
+	<compilerflag>-meabi</compilerflag>
+	<compilerflag>-O2</compilerflag>
+	<compilerflag>-Wno-strict-aliasing</compilerflag>
+	<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+	<compilerflag compiler="as">-gstabs+</compilerflag>
+</project>
--- a/base/applications/applications.rbuild
+++ b/base/applications/applications.rbuild
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="cacls">
+		<xi:include href="cacls/cacls.rbuild" />
+	</directory>
+	<directory name="calc">
+		<xi:include href="calc/calc.rbuild" />
+	</directory>
+	<directory name="charmap">
+		<xi:include href="charmap/charmap.rbuild" />
+	</directory>
+	<directory name="cmdutils">
+		<xi:include href="cmdutils/cmdutils.rbuild" />
+	</directory>
+	<directory name="control">
+		<xi:include href="control/control.rbuild" />
+	</directory>
+	<directory name="dxdiag">
+		<xi:include href="dxdiag/dxdiag.rbuild" />
+	</directory>
+	<directory name="extrac32">
+		<xi:include href="extrac32/extrac32.rbuild" />
+	</directory>
+	<directory name="findstr">
+		<xi:include href="findstr/findstr.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>
+	<directory name="mscutils">
+		<xi:include href="mscutils/directory.rbuild" />
+	</directory>
+	<directory name="mspaint">
+		<xi:include href="mspaint/mspaint.rbuild" />
+	</directory>
+	<directory name="mstsc">
+		<xi:include href="mstsc/mstsc.rbuild" />
+	</directory>
+	<directory name="network">
+		<xi:include href="network/network.rbuild" />
+	</directory>
+	<directory name="notepad">
+		<xi:include href="notepad/notepad.rbuild" />
+	</directory>
+	<directory name="regedit">
+		<xi:include href="regedit/regedit.rbuild" />
+	</directory>
+	<directory name="regedt32">
+		<xi:include href="regedt32/regedt32.rbuild" />
+	</directory>
+	<directory name="sc">
+		<xi:include href="sc/sc.rbuild" />
+	</directory>
+	<directory name="screensavers">
+		<xi:include href="screensavers/screensavers.rbuild" />
+	</directory>
+	<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>
+	<directory name="taskmgr">
+		<xi:include href="taskmgr/taskmgr.rbuild" />
+	</directory>
+	<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>
--- a/base/applications/cacls/cacls.rbuild
+++ b/base/applications/cacls/cacls.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" unicode="true">
+	<include base="cacls">.</include>
+	<library>advapi32</library>
+	<library>ntdll</library>
+	<library>user32</library>
+	<library>shell32</library>
+	<file>cacls.c</file>
+	<file>cacls.rc</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/cacls/lang/da-DA.rc
+++ b/base/applications/cacls/lang/da-DA.rc
--- a/base/applications/cacls/rsrc.rc
+++ b/base/applications/cacls/rsrc.rc
@@ -1,74 +1,26 @@
 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DA_DK
-    #include "lang/da-DK.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/da-DA.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/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/ko-KR.rc"
+#include "lang/nl-NL.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/calc/calc.rbuild
+++ b/base/applications/calc/calc.rbuild
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" unicode="yes">
+	<include base="calc">.</include>
+	<define name="DISABLE_HTMLHELP_SUPPORT">1</define>
+	<library>msvcrt</library>
+	<library>advapi32</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<file>about.c</file>
+	<file>convert.c</file>
+	<file>function.c</file>
+	<file>rpn.c</file>
+	<file>utl.c</file>
+	<file>winmain.c</file>
+	<file>resource.rc</file>
+	<pch>calc.h</pch>
+</module>
--- a/base/applications/calc/lang/bg-BG.rc
+++ b/base/applications/calc/lang/bg-BG.rc
@@ -1,8 +1,4 @@
-/* Превод на Български/ Bulgarian translation */
-/* http://www.reactos.org/wiki/Bulgarian_translation */
-/* LOCATION: \base\applications\calc\lang */
-/* Недовършен / Incomplete */
-
+//Недовършен
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 // Dialog
@@ -138,11 +134,11 @@ BEGIN
    PUSHBUTTON      "Дроб",IDC_BUTTON_F,286,140,24,18,BS_CENTER | BS_VCENTER |
                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX        "",IDC_STATIC,147,14,163,20
-    CONTROL         "ЧДума",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON |
                    NOT WS_VISIBLE,150,21,38,10
-    CONTROL         "ДДума",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON |
                    NOT WS_VISIBLE,190,21,38,10
-    CONTROL         "Дума",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT 
+    CONTROL         "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT
                    WS_VISIBLE,230,21,38,10
    CONTROL         "Байт",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT
                    WS_VISIBLE,270,21,38,10
@@ -209,7 +205,7 @@ BEGIN
                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON      "+",IDC_BUTTON_ADD,114,105,24,18,BS_CENTER | BS_VCENTER |
                    BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "Крн2",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | 
+    PUSHBUTTON      "Sqrt",IDC_BUTTON_SQRT,140,45,24,18,BS_CENTER |
                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON      "%",IDC_BUTTON_PERCENT,140,65,24,18,BS_CENTER |
                    BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
@@ -236,21 +232,21 @@ CAPTION "Изчислителят на РеактОС"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    PUSHBUTTON      "Преобразуване",IDC_BUTTON_CONVERT,35,105,76,17
+    PUSHBUTTON      "Convert",IDC_BUTTON_CONVERT,35,105,76,17
    COMBOBOX        IDC_COMBO_CATEGORY,5,31,140,168,CBS_DROPDOWNLIST |
                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Раздел:",IDC_STATIC,4,20,56,8
-    COMBOBOX        IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | 
+    LTEXT           "Category:",IDC_STATIC,5,20,56,8
+    COMBOBOX        IDC_COMBO_FROM,5,60,140,168,CBS_DROPDOWNLIST |
                    WS_VSCROLL | WS_TABSTOP | CBS_SORT
-    LTEXT           "Преобразуване от:",IDC_STATIC,4,49,56,8
-    COMBOBOX        IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    LTEXT           "Convert from:",IDC_STATIC,5,49,56,8
+    COMBOBOX        IDC_COMBO_TO,5,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL |
                    WS_TABSTOP | CBS_SORT
-    LTEXT           "Преобразуване в:",IDC_STATIC,4,76,56,8
+    LTEXT           "Convert to:",IDC_STATIC,5,76,56,8
    CONTROL         "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER |
                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
    CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER |
                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "Назад",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,5,1,312,14,SS_CENTERIMAGE,
@@ -287,7 +283,7 @@ BEGIN
                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,18
    CONTROL         "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER |
                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,18
-    CONTROL         "Крн2",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | 
+    CONTROL         "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER |
                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,18
    CONTROL         "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER |
                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,18
@@ -449,7 +445,7 @@ BEGIN
    IDS_CONV_CONSUMPTION    "Потребление (двигатели)"
    IDS_CONV_CURRENCY       "Парични единици"
    IDS_CONV_ENERGY         "Енергия"
-    IDS_CONV_LENGTH         "Дължина"
+    IDS_CONV_LENGTH         "Дължини"
    IDS_CONV_POWER          "Мощност"
    IDS_CONV_PRESSURE       "Налягане"
    IDS_CONV_TEMPERATURE    "Температура"
@@ -471,9 +467,9 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
    IDS_AREA_ACRES                  "Акри"
-    IDS_AREA_ACRES_BRAZIL           "Акри (бразилски)"
-    IDS_AREA_ACRES_FRANCE           "Акри (френски)"
-    IDS_AREA_ACRES_SCOTS            "Акри (шотландски)"
+    IDS_AREA_ACRES_BRAZIL           "Акри (Бразилски)"
+    IDS_AREA_ACRES_FRANCE           "Акри (Френски)"
+    IDS_AREA_ACRES_SCOTS            "Акри (Шотландски)"
    IDS_AREA_ACRES_US               "Акри (САЩ)"
    IDS_AREA_ARES                   "Арове"
    IDS_AREA_CHOU                   "Chou"
@@ -518,34 +514,34 @@ END
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Австрийски шилинг"
-    IDS_CURRENCY_BELGIAN_FRANC      "Белгийски франк"
-    IDS_CURRENCY_CYPRIOT_POUND      "Кипърска лира"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling"
+    IDS_CURRENCY_BELGIAN_FRANC      "Belgian franc"
+    IDS_CURRENCY_CYPRIOT_POUND      "Cypriot pound"
    IDS_CURRENCY_CZECH_KORUNA       "Чешка крона"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Германска марка"
-    IDS_CURRENCY_DUTCH_GUILDER      "Холандски гулден"
+    IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
+    IDS_CURRENCY_DUTCH_GUILDER      "Dutch guilder"
    IDS_CURRENCY_EURO               "Евро"
-    IDS_CURRENCY_FINNISH_MARKKA     "Финска марка"
-    IDS_CURRENCY_FRENCH_FRANC       "Френски франк"
-    IDS_CURRENCY_GREEK_DRACHMA      "Гръцка драхма"
-    IDS_CURRENCY_IRISH_POUND        "Ирландска лира"
-    IDS_CURRENCY_ITALIAN_LIRA       "Италианска лира"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "Люксембургски франк"
-    IDS_CURRENCY_MALTESE_LIRA       "Малтийска лира"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Португалско ескудо"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Словашка крона"
-    IDS_CURRENCY_SLOVENIAN_TOLAR    "Словенси толар"
-    IDS_CURRENCY_SPANISH_PESETA     "Испанска песета"
+    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-градусови калории"
-    IDS_ENERGY_BTUS                 "Британски топлинни единици"
+    IDS_ENERGY_15_C_CALORIES        "15-градусни калории"
+    IDS_ENERGY_BTUS                 "Британски термални единици"
    IDS_ENERGY_ERGS                 "Ергове"
    IDS_ENERGY_EVS                  "Електронволти"
-    IDS_ENERGY_FOOT_POUNDS          "Стъпки-фунтове"
+    IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
    IDS_ENERGY_IT_CALORIES          "Международни таблични калории"
    IDS_ENERGY_IT_KILOCALORIES      "Международни таблични килокалории"
    IDS_ENERGY_JOULES               "Джаули"
@@ -610,8 +606,8 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "Британски топлинни единици в минута"
-    IDS_POWER_FPS_PER_MINUTE        "Стъпки-фунтове в минута"
+    IDS_POWER_BTUS_PER_MINUTE       "British Thermal Units per minute"
+    IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds per minute"
    IDS_POWER_HORSEPOWER            "Конски сили"
    IDS_POWER_KILOWATTS             "Киловатове"
    IDS_POWER_MEGAWATTS             "Мегаватове"
@@ -644,7 +640,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
    IDS_TIME_DAYS         "Дни"
    IDS_TIME_HOURS        "Часи"
-    IDS_TIME_NANOSECONDS  "Наносекунди"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
    IDS_TIME_MICROSECONDS "Микросекунди"
    IDS_TIME_MILLISECONDS "Милисекунди"
    IDS_TIME_MINUTES      "Минути"
@@ -682,7 +678,7 @@ BEGIN
    IDS_VOLUME_DOE                  "Doe"
    IDS_VOLUME_FLUID_OUNCES_UK      "Течни унции (ОК)"
    IDS_VOLUME_FLUID_OUNCES_US      "Течни унции (САЩ)"
-    IDS_VOLUME_GALLONS_UK           "Галони (ОК)"
+    IDS_VOLUME_GALLONS_UK           "Галони (UK)"
    IDS_VOLUME_GALLONS_DRY_US       "Галони, сухи (САЩ)"
    IDS_VOLUME_GALLONS_LIQUID_US    "Галони, течни (САЩ)"
    IDS_VOLUME_GOU                  "Gou"
@@ -716,13 +712,13 @@ BEGIN
    IDS_WEIGHT_GRAMS                "Grams"
    IDS_WEIGHT_GWAN                 "Gwan"
    IDS_WEIGHT_HARB                 "Harb"
-    IDS_WEIGHT_JIN_CHINA            "Джинове (китайски)"
-    IDS_WEIGHT_JIN_TAIWAN           "Джинове (тайвански)"
+    IDS_WEIGHT_JIN_CHINA            "Джинове (Китай)"
+    IDS_WEIGHT_JIN_TAIWAN           "Джинове (Тайван)"
    IDS_WEIGHT_KAN                  "Kan"
    IDS_WEIGHT_KILOGRAMS            "Килограми"
    IDS_WEIGHT_KIN                  "Kin"
-    IDS_WEIGHT_LIANG_CHINA          "Liang (китайски)"
-    IDS_WEIGHT_LIANG_TAIWAN         "Liang (тайвански)"
+    IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
+    IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
    IDS_WEIGHT_MONME                "Monme"
    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Унции, avoirdupois"
    IDS_WEIGHT_OUNCES_TROY          "Унции, трой"
--- a/base/applications/calc/resource.rc
+++ b/base/applications/calc/resource.rc
@@ -45,66 +45,24 @@ IDB_BITMAP_ROS          BITMAP  DISCARDABLE     "res/ROS_logo.bmp"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_TH_TH
-    #include "lang/th-TH.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/el-GR.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/ko-KR.rc"
+#include "lang/nl-NL.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/th-TH.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/charmap/charmap.rbuild
+++ b/base/applications/charmap/charmap.rbuild
@@ -0,0 +1,14 @@
+<?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>
+	<file>about.c</file>
+	<file>charmap.c</file>
+	<file>lrgcell.c</file>
+	<file>map.c</file>
+	<file>charmap.rc</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/charmap/lang/bg-BG.rc
+++ b/base/applications/charmap/lang/bg-BG.rc
@@ -1,6 +1,3 @@
-/* Превод на Български/ Bulgarian translation */
-/* http://www.reactos.org/wiki/Bulgarian_translation */
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 IDD_CHARMAP DIALOGEX 6, 6, 292, 224
@@ -15,21 +12,21 @@ BEGIN
  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
  DEFPUSHBUTTON "Избор", IDC_SELECT, 194, 186, 44, 13
  PUSHBUTTON    "Запомняне", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  CONTROL       "Разширен изглед",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
 END

 IDD_ADVANCED DIALOGEX  0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT         "Знаков набор:",IDC_STATIC,8,8,48,8
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  LTEXT         "Сбиране по:",IDC_STATIC,8,28,50,8
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  PUSHBUTTON    "Търсене",IDC_BUTTON_SEARCH,200,44,50,14
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
-  LTEXT         "Търсене на:",IDC_STATIC,8,48,42,8
-  LTEXT         "Уникод:",IDC_STATIC,200,8,30,8
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END

--- a/base/applications/charmap/rsrc.rc
+++ b/base/applications/charmap/rsrc.rc
@@ -1,74 +1,26 @@
 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/el-GR.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/nl-NL.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/cmdutils/cmdutils.rbuild
+++ b/base/applications/cmdutils/cmdutils.rbuild
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="dbgprint">
+		<xi:include href="dbgprint/dbgprint.rbuild" />
+	</directory>
+	<directory name="doskey">
+		<xi:include href="doskey/doskey.rbuild" />
+	</directory>
+	<directory name="find">
+		<xi:include href="find/find.rbuild" />
+	</directory>
+	<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>
+</group>
--- a/base/applications/cmdutils/dbgprint/dbgprint.rbuild
+++ b/base/applications/cmdutils/dbgprint/dbgprint.rbuild
@@ -0,0 +1,5 @@
+<?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>
--- a/base/applications/cmdutils/doskey/doskey.rbuild
+++ b/base/applications/cmdutils/doskey/doskey.rbuild
@@ -0,0 +1,7 @@
+<?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>
+	<file>doskey.c</file>
+	<file>doskey.rc</file>
+</module>
--- a/base/applications/cmdutils/doskey/doskey.rc
+++ b/base/applications/cmdutils/doskey/doskey.rc
@@ -8,33 +8,13 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/pl-PL.rc"
+#include "lang/ro-RO.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/fr-FR.rc"
+#include "lang/es-ES.rc"
--- a/base/applications/cmdutils/find/find.rbuild
+++ b/base/applications/cmdutils/find/find.rbuild
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="find" type="win32cui" installbase="system32" installname="find.exe">
+	<library>user32</library>
+	<file>find.c</file>
+	<file>find.rc</file>
+	<file>rsrc.rc</file>
+</module>
--- a/base/applications/cmdutils/find/find.rc
+++ b/base/applications/cmdutils/find/find.rc
@@ -1,3 +1,4 @@
+/* $Id$ */
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 find command\0"
 #define REACTOS_STR_INTERNAL_NAME	"find\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"find.exe\0"
--- a/base/applications/cmdutils/find/rsrc.rc
+++ b/base/applications/cmdutils/find/rsrc.rc
@@ -3,60 +3,22 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#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/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/lt-LT.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/cmdutils/hostname/hostname.rbuild
+++ b/base/applications/cmdutils/hostname/hostname.rbuild
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe">
+	<file>hostname.c</file>
+	<file>hostname.rc</file>
+</module>
+
--- a/base/applications/cmdutils/lodctr/lodctr.rbuild
+++ b/base/applications/cmdutils/lodctr/lodctr.rbuild
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="lodctr" type="win32cui" installbase="system32" installname="lodctr.exe" unicode="yes">
+	<library>loadperf</library>
+	<library>wine</library>
+	<file>lodctr_main.c</file>
+</module>
--- a/base/applications/cmdutils/more/more.rbuild
+++ b/base/applications/cmdutils/more/more.rbuild
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="more" type="win32cui" installbase="system32" installname="more.exe">
+	<library>ntdll</library>
+	<library>user32</library>
+	<file>more.c</file>
+	<file>more.rc</file>
+</module>
--- a/base/applications/cmdutils/more/rsrc.rc
+++ b/base/applications/cmdutils/more/rsrc.rc
@@ -1,56 +1,20 @@
 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/el-GR.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/lt-LT.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/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/cmdutils/reg/reg.rbuild
+++ b/base/applications/cmdutils/reg/reg.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="reg" type="win32cui" installbase="system32" installname="reg.exe" unicode="true">
+	<include base="reg">.</include>
+	<redefine name="_WIN32_WINNT">0x600</redefine>
+	<library>wine</library>
+	<library>advapi32</library>
+	<library>user32</library>
+	<file>reg.c</file>
+	<file>rsrc.rc</file>
+</module>
--- a/base/applications/cmdutils/reg/rsrc.rc
+++ b/base/applications/cmdutils/reg/rsrc.rc
@@ -1,59 +1,21 @@
-#ifdef LANGUAGE_EN_US
-    #include "En.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "Ko.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "Nl.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "Pl.rc"
-#endif
+#include "En.rc"
+#include "Ko.rc"
+#include "Nl.rc"
+#include "Pl.rc"

 /* UTF-8 */
-#ifdef LANGUAGE_BG_BG
-    #include "Bg.rc"
-#endif
-#ifdef LANGUAGE_DA_DK
-    #include "Da.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "De.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "Es.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "Fr.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "It.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "Ja.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "Lt.rc"
-#endif
-#ifdef LANGUAGE_NO_NO
-    #include "No.rc"
-#endif
-#ifdef LANGUAGE_PT_PT
-    #include "Pt.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "Ro.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "Ru.rc"
-#endif
-#ifdef LANGUAGE_SL_SI
-    #include "Si.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "Sv.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "Uk.rc"
-#endif
+#include "Bg.rc"
+#include "Da.rc"
+#include "De.rc"
+#include "Es.rc"
+#include "Fr.rc"
+#include "It.rc"
+#include "Ja.rc"
+#include "Lt.rc"
+#include "No.rc"
+#include "Pt.rc"
+#include "Ro.rc"
+#include "Ru.rc"
+#include "Si.rc"
+#include "Sv.rc"
+#include "Uk.rc"
--- a/base/applications/cmdutils/xcopy/rsrc.rc
+++ b/base/applications/cmdutils/xcopy/rsrc.rc
@@ -26,62 +26,24 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define REACTOS_STR_ORIGINAL_FILENAME	"xcopy.exe\0"
 #include <reactos/version.rc>

-#ifdef LANGUAGE_DA_DK
-    #include "Da.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "En.rc"
-#endif
-#ifdef LANGUAGE_NO_NO
-    #include "No.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "Pl.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "Es.rc"
-#endif
+#include "Da.rc"
+#include "En.rc"
+#include "No.rc"
+#include "Pl.rc"
+#include "Es.rc"

 /* UTF-8 */
-#ifdef LANGUAGE_DE_DE
-    #include "De.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "Fr.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "It.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "Ja.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "Ko.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "Lt.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "Nl.rc"
-#endif
-#ifdef LANGUAGE_PT_PT
-    #include "Pt.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "Ro.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "Ru.rc"
-#endif
-#ifdef LANGUAGE_SL_SI
-    #include "Si.rc"
-#endif
-#ifdef LANGUAGE_SR_SP
-    #include "Sr.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "Sv.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "Uk.rc"
-#endif
+#include "De.rc"
+#include "Fr.rc"
+#include "It.rc"
+#include "Ja.rc"
+#include "Ko.rc"
+#include "Lt.rc"
+#include "Nl.rc"
+#include "Pt.rc"
+#include "Ro.rc"
+#include "Ru.rc"
+#include "Si.rc"
+#include "Sr.rc"
+#include "Sv.rc"
+#include "Uk.rc"
--- a/base/applications/cmdutils/xcopy/xcopy.c
+++ b/base/applications/cmdutils/xcopy/xcopy.c
--- a/base/applications/cmdutils/xcopy/xcopy.rbuild
+++ b/base/applications/cmdutils/xcopy/xcopy.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="xcopy" type="win32cui" installbase="system32" installname="xcopy.exe" unicode="true">
+	<include base="xcopy">.</include>
+	<library>wine</library>
+	<library>shell32</library>
+	<library>user32</library>
+	<file>xcopy.c</file>
+	<file>rsrc.rc</file>
+	<metadata description="xcopy command-line tool" />
+</module>
--- a/base/applications/control/control.rbuild
+++ b/base/applications/control/control.rbuild
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe" unicode="yes">
+	<include base="control">.</include>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<file>control.c</file>
+	<file>control.rc</file>
+</module>
--- a/base/applications/dxdiag/dxdiag.rbuild
+++ b/base/applications/dxdiag/dxdiag.rbuild
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe" unicode="yes">
+	<include base="dxdiag">.</include>
+	<library>user32</library>
+	<library>advapi32</library>
+	<library>comctl32</library>
+	<library>shell32</library>
+	<library>version</library>
+	<library>dinput8</library>
+	<library>setupapi</library>
+	<library>dxguid</library>
+	<library>dsound</library>
+	<library>ddraw</library>
+	<library>version</library>
+	<library>gdi32</library>
+	<library>winmm</library>
+	<library>wintrust</library>
+	<library>d3d9</library>
+	<file>system.c</file>
+	<file>display.c</file>
+	<file>sound.c</file>
+	<file>music.c</file>
+	<file>input.c</file>
+	<file>network.c</file>
+	<file>help.c</file>
+	<file>dxdiag.c</file>
+	<file>dxdiag.rc</file>
+	<file>ddtest.c</file>
+	<file>d3dtest.c</file>
+	<file>d3dtest7.c</file>
+	<file>d3dtest8.c</file>
+	<file>d3dtest9.c</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/dxdiag/rsrc.rc
+++ b/base/applications/dxdiag/rsrc.rc
@@ -1,59 +1,21 @@
 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/ja-JP.rc"
+#include "lang/ko-KR.rc"
+#include "lang/nl-NL.rc"
+#include "lang/no-NO.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/extrac32/extrac32.rbuild
+++ b/base/applications/extrac32/extrac32.rbuild
@@ -0,0 +1,9 @@
+<module name="extrac32" type="win32gui" installbase="system32" installname="extrac32.exe" unicode="yes">
+	<include base="extrac32">.</include>
+	<library>wine</library>
+	<library>shell32</library>
+	<library>setupapi</library>
+	<library>shlwapi</library>
+	<library>user32</library>
+	<file>extrac32.c</file>
+</module>
--- a/base/applications/findstr/findstr.rbuild
+++ b/base/applications/findstr/findstr.rbuild
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="findstr" type="win32cui" installbase="system32" installname="findstr.exe">
+	<library>user32</library>
+	<file>findstr.c</file>
+	<file>findstr.rc</file>
+	<file>rsrc.rc</file>
+</module>
--- a/base/applications/findstr/rsrc.rc
+++ b/base/applications/findstr/rsrc.rc
@@ -3,63 +3,23 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/el-GR.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/lt-LT.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/fontview/fontview.rbuild
+++ b/base/applications/fontview/fontview.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="fontview" type="win32gui" installbase="system32" installname="fontview.exe">
+	<include base="fontview">.</include>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>shell32</library>
+	<file>fontview.c</file>
+	<file>display.c</file>
+	<file>fontview.rc</file>
+</module>
--- a/base/applications/fontview/fontview.rc
+++ b/base/applications/fontview/fontview.rc
@@ -14,51 +14,19 @@ END

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/lt-LT.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/games/games.rbuild
+++ b/base/applications/games/games.rbuild
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+<directory name="solitaire">
+	<xi:include href="solitaire/solitaire.rbuild" />
+</directory>
+<directory name="spider">
+	<xi:include href="spider/spider.rbuild" />
+</directory>
+<directory name="winmine">
+	<xi:include href="winmine/winmine.rbuild" />
+</directory>
+</group>
--- a/base/applications/games/solitaire/rsrc.rc
+++ b/base/applications/games/solitaire/rsrc.rc
@@ -7,81 +7,29 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_EU_ES
-    #include "lang/eu-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_HU_HU
-    #include "lang/hu-HU.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_TH_TH
-    #include "lang/th-TH.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#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/es-ES.rc"
+#include "lang/eu-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.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/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/sv-SE.rc"
+#include "lang/th-TH.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/games/solitaire/solitaire.rbuild
+++ b/base/applications/games/solitaire/solitaire.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="yes">
+	<include base="sol">.</include>
+	<include base="cardlib">.</include>
+	<library>cardlib</library>
+	<file>solcreate.cpp</file>
+	<file>solgame.cpp</file>
+	<file>solitaire.cpp</file>
+	<file>rsrc.rc</file>
+	<pch>solitaire.h</pch>
+</module>
--- a/base/applications/games/spider/rsrc.rc
+++ b/base/applications/games/spider/rsrc.rc
@@ -7,57 +7,21 @@ IDI_SPIDER ICON DISCARDABLE "spider.ico"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_HU_HU
-    #include "lang/hu-HU.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/games/spider/spider.rbuild
+++ b/base/applications/games/spider/spider.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="spider" type="win32gui" installbase="system32" installname="spider.exe" unicode="yes">
+	<include base="spider">.</include>
+    <include base="cardlib">.</include>
+	<library>cardlib</library>
+	<file>spigame.cpp</file>
+	<file>spider.cpp</file>
+	<file>rsrc.rc</file>
+	<pch>spider.h</pch>
+</module>
--- a/base/applications/games/winmine/rsrc.rc
+++ b/base/applications/games/winmine/rsrc.rc
@@ -44,75 +44,27 @@ MINES BITMAP rc/mines.bmp
 /* include localised resources */
 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DA_DK
-    #include "lang/da-DK.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FI_FI
-    #include "lang/fi-FI.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_PT
-    #include "lang/pt-PT.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SL_SI
-    #include "lang/sl-SI.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/tr-TR.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/da-DK.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fi-FI.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/ko-KR.rc"
+#include "lang/lt-LT.rc"
+#include "lang/nl-NL.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-PT.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sl-SI.rc"
+#include "lang/sv-SE.rc"
+#include "lang/tr-TR.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/games/winmine/winmine.rbuild
+++ b/base/applications/games/winmine/winmine.rbuild
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="winmine" type="win32gui" installbase="system32" installname="winmine.exe" unicode="no">
+	<include base="winmine">.</include>
+	<library>wine</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<file>main.c</file>
+	<file>dialog.c</file>
+	<file>rsrc.rc</file>
+</module>
--- a/base/applications/hh/hh.rbuild
+++ b/base/applications/hh/hh.rbuild
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hh" type="win32gui" installbase="system32" installname="hh.exe" unicode="no">
+	<include base="hh">.</include>
+	<library>user32</library>
+	<library>gdi32</library>
+	<file>main.c</file>
+	<file>hh.rc</file>
+</module>
--- a/base/applications/iexplore/iexplore.rbuild
+++ b/base/applications/iexplore/iexplore.rbuild
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="iexplore" type="win32gui" installbase="system32" installname="iexplore.exe" unicode="no">
+	<include base="iexplore">.</include>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>shdocvw</library>
+	<file>main.c</file>
+	<file>iexplore.rc</file>
+</module>
--- a/base/applications/kbswitch/kbsdll/kbsdll.rbuild
+++ b/base/applications/kbswitch/kbsdll/kbsdll.rbuild
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes">
+	<importlibrary definition="kbsdll.spec" />
+	<include base="kbsdll">.</include>
+	<library>user32</library>
+	<library>comctl32</library>
+	<file>kbsdll.c</file>
+	<file>kbsdll.rc</file>
+</module>
--- a/base/applications/kbswitch/kbswitch.rbuild
+++ b/base/applications/kbswitch/kbswitch.rbuild
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+<module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes">
+	<include base="kbswitch">.</include>
+	<library>advapi32</library>
+	<library>user32</library>
+	<library>shell32</library>
+	<library>gdi32</library>
+	<file>kbswitch.c</file>
+	<file>kbswitch.rc</file>
+</module>
+<directory name="kbsdll">
+	<xi:include href="kbsdll/kbsdll.rbuild" />
+</directory>
+</group>
--- a/base/applications/kbswitch/rsrc.rc
+++ b/base/applications/kbswitch/rsrc.rc
@@ -1,59 +1,21 @@
 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/lt-LT.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/logoff/logoff.rbuild
+++ b/base/applications/logoff/logoff.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="logoff" type="win32cui" installbase="system32" installname="logoff.exe">
+	<include base="logoff">.</include>
+	<library>advapi32</library>
+	<library>user32</library>
+	<file>misc.c</file>
+	<file>logoff.c</file>
+	<file>logoff.rc</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/logoff/rsrc.rc
+++ b/base/applications/logoff/rsrc.rc
@@ -1,68 +1,24 @@
 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/el-GR.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/ko-KR.rc"
+#include "lang/lt-LT.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/magnify/magnify.rbuild
+++ b/base/applications/magnify/magnify.rbuild
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe">
+	<include base="magnify">.</include>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<file>magnifier.c</file>
+	<file>settings.c</file>
+	<file>magnify.rc</file>
+	<pch>magnifier.h</pch>
+</module>
--- a/base/applications/magnify/rsrc.rc
+++ b/base/applications/magnify/rsrc.rc
@@ -3,51 +3,19 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.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/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/mmc/mmc.rbuild
+++ b/base/applications/mmc/mmc.rbuild
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes">
+	<include base="mmcclient">.</include>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>comdlg32</library>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<library>comctl32</library>
+	<file>console.c</file>
+	<file>misc.c</file>
+	<file>mmc.c</file>
+	<file>mmc.rc</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/mmc/rsrc.rc
+++ b/base/applications/mmc/rsrc.rc
@@ -3,66 +3,24 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#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/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/ko-KR.rc"
+#include "lang/lt-LT.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/mplay32/lang/bg-BG.rc
+++ b/base/applications/mplay32/lang/bg-BG.rc
@@ -1,6 +1,3 @@
-/* Превод на Български/ Bulgarian translation */
-/* http://www.reactos.org/wiki/Bulgarian_translation */
-/* LOCATION:\base\applications\mplay32\lang */
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 IDR_MAINMENU MENU
--- a/base/applications/mplay32/mplay32.rbuild
+++ b/base/applications/mplay32/mplay32.rbuild
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="mplay32" type="win32gui" installbase="system32" installname="mplay32.exe" unicode="yes">
+	<include base="mplay32">.</include>
+	<library>advapi32</library>
+	<library>comctl32</library>
+	<library>comdlg32</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>winmm</library>
+	<library>shell32</library>
+	<file>mplay32.c</file>
+	<file>mplay32.rc</file>
+</module>
--- a/base/applications/mplay32/rsrc.rc
+++ b/base/applications/mplay32/rsrc.rc
@@ -3,60 +3,22 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/nl-NL.rc"
+#include "lang/ja-JP.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/msconfig/msconfig.rbuild
+++ b/base/applications/msconfig/msconfig.rbuild
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe" unicode="yes">
+	<include base="msconfig">.</include>
+	<library>user32</library>
+	<library>advapi32</library>
+	<library>version</library>
+	<library>comctl32</library>
+	<library>shell32</library>
+	<library>shlwapi</library>
+	<compilationunit name="unit.c">
+		<file>toolspage.c</file>
+		<file>srvpage.c</file>
+		<file>systempage.c</file>
+		<file>startuppage.c</file>
+		<file>freeldrpage.c</file>
+		<file>generalpage.c</file>
+		<file>msconfig.c</file>
+	</compilationunit>
+	<file>msconfig.rc</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/msconfig/rsrc.rc
+++ b/base/applications/msconfig/rsrc.rc
@@ -8,75 +8,27 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 /* include localised resources */
 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_HU_HU
-    #include "lang/hu-HU.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_TH_TH
-    #include "lang/th-TH.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#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/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ko-KR.rc"
+#include "lang/nl-NL.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/th-TH.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/mscutils/devmgmt/devmgmt.rbuild
+++ b/base/applications/mscutils/devmgmt/devmgmt.rbuild
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="devmgmt" type="win32gui" installbase="system32" installname="devmgmt.exe" unicode="yes">
+<include base="devmgmt">.</include>
+	<library>ntdll</library>
+	<library>setupapi</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>comctl32</library>
+	<library>advapi32</library>
+	<library>devmgr</library>
+	<compilationunit name="unit.c">
+		<file>about.c</file>
+		<file>devmgmt.c</file>
+		<file>enumdevices.c</file>
+		<file>mainwnd.c</file>
+		<file>misc.c</file>
+	</compilationunit>
+	<file>devmgmt.rc</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/mscutils/devmgmt/rsrc.rc
+++ b/base/applications/mscutils/devmgmt/rsrc.rc
@@ -14,63 +14,23 @@ IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_TH_TH
-    #include "lang/th-TH.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#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/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/pl-PL.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/th-TH.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/mscutils/devmgmt_new/rsrc.rc
+++ b/base/applications/mscutils/devmgmt_new/rsrc.rc
@@ -12,63 +12,25 @@ IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp"
 IDB_HELP    BITMAP DISCARDABLE "res/help.bmp"
 IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"

-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_TH_TH
-    #include "lang/th-TH.rc"
-#endif
+#include "lang/bg-BG.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/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/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/th-TH.rc"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#include "lang/pl-PL.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/mscutils/directory.rbuild
+++ b/base/applications/mscutils/directory.rbuild
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="devmgmt">
+		<xi:include href="devmgmt/devmgmt.rbuild" />
+	</directory>
+	<directory name="eventvwr">
+		<xi:include href="eventvwr/eventvwr.rbuild" />
+	</directory>
+	<directory name="servman">
+		<xi:include href="servman/servman.rbuild" />
+	</directory>
+</group>
--- a/base/applications/mscutils/eventvwr/eventvwr.rbuild
+++ b/base/applications/mscutils/eventvwr/eventvwr.rbuild
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" unicode="yes">
+	<include base="eventvwr">.</include>
+	<library>user32</library>
+	<library>comctl32</library>
+	<library>advapi32</library>
+	<file>eventvwr.c</file>
+	<file>eventvwr.rc</file>
+</module>
--- a/base/applications/mscutils/eventvwr/rsrc.rc
+++ b/base/applications/mscutils/eventvwr/rsrc.rc
@@ -11,54 +11,20 @@ IDI_ERRORICON           ICON  "res/error.ico"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#include "lang/bg-BG.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/ja-JP.rc"
+#include "lang/ko-KR.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/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/mscutils/servman/rsrc.rc
+++ b/base/applications/mscutils/servman/rsrc.rc
@@ -22,60 +22,22 @@ IDI_DRIVER      ICON "res/driver.ico"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_TH_TH
-    #include "lang/th-TH.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#include "lang/bg-BG.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/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/pl-PL.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/th-TH.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/mscutils/servman/servman.rbuild
+++ b/base/applications/mscutils/servman/servman.rbuild
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="servman" type="win32gui" installbase="system32" installname="servman.exe" unicode="yes">
+	<include base="servman">.</include>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>advapi32</library>
+	<library>version</library>
+	<library>comctl32</library>
+	<library>shell32</library>
+	<library>comdlg32</library>
+	<compilationunit name="unit.c">
+		<file>about.c</file>
+		<file>control.c</file>
+		<file>create.c</file>
+		<file>delete.c</file>
+		<file>dependencies_tv1.c</file>
+		<file>dependencies_tv2.c</file>
+		<file>export.c</file>
+		<file>listview.c</file>
+		<file>mainwnd.c</file>
+		<file>misc.c</file>
+		<file>progress.c</file>
+		<file>propsheet.c</file>
+		<file>propsheet_depends.c</file>
+		<file>propsheet_general.c</file>
+		<file>query.c</file>
+		<file>servman.c</file>
+		<file>start.c</file>
+		<file>stop.c</file>
+		<file>stop_dependencies.c</file>		
+	</compilationunit>
+	<file>servman.rc</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/mspaint/lang/bg-BG.rc
+++ b/base/applications/mspaint/lang/bg-BG.rc
@@ -1,9 +1,9 @@
 /*
 * PROJECT:     PAINT for ReactOS
 * LICENSE:     unknown (LGPL assumed)
- * Превод на Български/ Bulgarian translation
- * http://www.reactos.org/wiki/Bulgarian_translation
- * LOCATION: \base\applications\mspaint\lang
+ * FILE:        base/applications/mspaint/lang/bg-BG.rc
+ * PURPOSE:     Bulgarian Language resource file
+ * TRANSLATORS: unknown
 */

 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
@@ -178,8 +178,8 @@ STRINGTABLE
 BEGIN
    IDS_PROGRAMNAME, "Рисуване"
    IDS_WINDOWTITLE, "%s - рисуване"
-    IDS_INFOTITLE, "Рисувач (Paint) за РеактОС"
-    IDS_INFOTEXT, "Рисувач (Paint) за РеактОС е достъпен под GNU Lesser General Public License (LGPL) версия 3 (see www.gnu.org)"
+    IDS_INFOTITLE, "Рисунък (Paint) за РеактОС"
+    IDS_INFOTEXT, "Рисунък (Paint) за РеактОС е достъпен под GNU Lesser General Public License (LGPL) версия 3 (see www.gnu.org)"
    IDS_SAVEPROMPTTEXT, "Искате ли да запишете промените в %s?"
    IDS_DEFAULTFILENAME, "Без име.bmp"
    IDS_MINIATURETITLE, "Изображенийце"
@@ -201,6 +201,6 @@ BEGIN
    IDS_TOOLTIP16, "Заоблен правоъгълник"
    IDS_OPENFILTER, "Файлове bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1Всички файлове (*.*)\1*.*\1"
    IDS_SAVEFILTER, "24 разрядни файлове bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1"
-    IDS_FILESIZE, "%d разряда"
-    IDS_PRINTRES, "%d x %d точки на метър"
+    IDS_FILESIZE, "%d bytes"
+    IDS_PRINTRES, "%d x %d pixels per meter"
 END
--- a/base/applications/mspaint/mspaint.rbuild
+++ b/base/applications/mspaint/mspaint.rbuild
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="mspaint" type="win32gui" installbase="system32" installname="mspaint.exe" unicode="yes" allowwarnings="true">
+	<include base="mspaint">.</include>
+	<library>comdlg32</library>
+	<library>shell32</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>advapi32</library>
+	<library>comctl32</library>
+	<file>dialogs.c</file>
+	<file>dib.c</file>
+	<file>drawing.c</file>
+	<file>history.c</file>
+	<file>main.c</file>
+	<file>mouse.c</file>
+	<file>palette.c</file>
+	<file>registry.c</file>
+	<file>selection.c</file>
+	<file>sizebox.c</file>
+	<file>toolsettings.c</file>
+	<file>winproc.c</file>
+	<file>rsrc.rc</file>
+</module>
--- a/base/applications/mspaint/rsrc.rc
+++ b/base/applications/mspaint/rsrc.rc
@@ -21,72 +21,26 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_GB
-    #include "lang/en-GB.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_EU_ES
-    #include "lang/eu-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_HU_HU
-    #include "lang/hu-HU.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_PT_PT
-    #include "lang/pt-PT.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-GB.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/eu-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
+#include "lang/pt-PT.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/mstsc/mstsc.rbuild
+++ b/base/applications/mstsc/mstsc.rbuild
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes">
+	<include base="mstsc">.</include>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>comctl32</library>
+	<library>ws2_32</library>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<library>ole32</library>
+	<library>comdlg32</library>
+	<compilationunit name="unit.c">
+		<file>bitmap.c</file>
+		<file>bsops.c</file>
+		<file>cache.c</file>
+		<file>channels.c</file>
+		<file>connectdialog.c</file>
+		<file>iso.c</file>
+		<file>licence.c</file>
+		<file>mcs.c</file>
+		<file>mppc.c</file>
+		<file>orders.c</file>
+		<file>pstcache.c</file>
+		<file>rdp5.c</file>
+		<file>rdp.c</file>
+		<file>secure.c</file>
+		<file>settings.c</file>
+		<file>ssl_calls.c</file>
+		<file>tcp.c</file>
+		<file>uimain.c</file>
+		<file>win32.c</file>
+	</compilationunit>
+	<file>rdc.rc</file>
+	<pch>precomp.h</pch>
+</module>
--- a/base/applications/mstsc/rsrc.rc
+++ b/base/applications/mstsc/rsrc.rc
@@ -14,66 +14,24 @@ IDB_SPECT   BITMAP "res/spectrum.bmp"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CA_ES
-    #include "lang/ca-ES.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
+#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/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/ko-KR.rc"
+#include "lang/lt-LT.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/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"
--- a/base/applications/network/arp/arp.rbuild
+++ b/base/applications/network/arp/arp.rbuild
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="arp" type="win32cui" installbase="system32" installname="arp.exe">
+	<include base="arp">.</include>
+	<library>iphlpapi</library>
+	<library>ws2_32</library>
+	<library>shlwapi</library>
+	<file>arp.c</file>
+	<file>arp.rc</file>
+</module>
--- a/base/applications/network/dwnl/dwnl.rbuild
+++ b/base/applications/network/dwnl/dwnl.rbuild
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="dwnl" type="win32cui" installbase="system32" installname="dwnl.exe" unicode="yes">
+	<include base="dwnl">.</include>
+	<library>urlmon</library>
+	<library>wininet</library>
+	<library>uuid</library>
+	<file>dwnl.c</file>
+</module>
--- a/base/applications/network/finger/finger.rbuild
+++ b/base/applications/network/finger/finger.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="finger" type="win32cui" installbase="system32" installname="finger.exe">
+	<include base="finger">.</include>
+	<define name="__USE_W32_SOCKETS" />
+	<library>ws2_32</library>
+	<file>finger.c</file>
+	<file>err.c</file>
+	<file>getopt.c</file>
+	<file>net.c</file>
+	<file>finger.rc</file>
+</module>
--- a/base/applications/network/ftp/cmds.c
+++ b/base/applications/network/ftp/cmds.c
@@ -1627,7 +1627,7 @@ void quit(int argc, const char *argv[])
 */
 void disconnect(int argc, const char *argv[])
 {
-	extern SOCKET cout;
+	extern int cout;
 	extern int data;

 	if (!connected)
--- a/base/applications/network/ftp/ftp.rbuild
+++ b/base/applications/network/ftp/ftp.rbuild
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe">
+	<include base="ftp">.</include>
+	<define name="lint" />
+
+	<!-- FIXME: workarounds until we have a proper oldnames library -->
+	<define name="chdir">_chdir</define>
+	<define name="getcwd">_getcwd</define>
+	<define name="mktemp">_mktemp</define>
+	<define name="unlink">_unlink</define>
+	<define name="close">_close</define>
+	<define name="fileno">_fileno</define>
+	<define name="read">_read</define>
+	<define name="write">_write</define>
+	<define name="lseek">_lseek</define>
+
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<library>oldnames</library>
+	<file>cmds.c</file>
+	<file>cmdtab.c</file>
+	<file>domacro.c</file>
+	<file>fake.c</file>
+	<file>ftp.c</file>
+	<file>main.c</file>
+	<file>ruserpass.c</file>
+	<file>ftp.rc</file>
+</module>
--- a/base/applications/network/ftp/main.c
+++ b/base/applications/network/ftp/main.c
@@ -250,7 +250,7 @@ void intr(void)

 void lostpeer(void)
 {
-   extern SOCKET cout;
+   extern int cout;
   extern int data;

   if (connected) {
--- a/base/applications/network/ipconfig/ipconfig.rbuild
+++ b/base/applications/network/ipconfig/ipconfig.rbuild
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe">
+	<include base="ipconfig">.</include>
+	<library>user32</library>
+	<library>iphlpapi</library>
+	<library>advapi32</library>
+	<file>ipconfig.c</file>
+	<file>ipconfig.rc</file>
+</module>
--- a/base/applications/network/ipconfig/ipconfig.rc
+++ b/base/applications/network/ipconfig/ipconfig.rc
@@ -10,48 +10,18 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.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/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/network/net/net.rbuild
+++ b/base/applications/network/net/net.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="net" type="win32cui" installbase="system32" installname="net.exe">
+	<include base="ping">.</include>
+	<define name="__USE_W32_SOCKETS" />
+	<library>ws2_32</library>
+	<file>main.c</file>
+	<file>cmdstart.c</file>
+	<file>cmdStop.c</file>
+	<file>help.c</file>
+	<file>process.c</file>
+</module>
--- a/base/applications/network/netstat/netstat.rbuild
+++ b/base/applications/network/netstat/netstat.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe">
+	<include base="netstat">.</include>
+	<library>user32</library>
+	<library>ws2_32</library>
+	<library>snmpapi</library>
+	<library>iphlpapi</library>
+	<file>netstat.c</file>
+	<file>netstat.rc</file>
+</module>
--- a/base/applications/network/network.rbuild
+++ b/base/applications/network/network.rbuild
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="arp">
+		<xi:include href="arp/arp.rbuild" />
+	</directory>
+	<directory name="dwnl">
+		<xi:include href="dwnl/dwnl.rbuild" />
+	</directory>
+	<directory name="finger">
+		<xi:include href="finger/finger.rbuild" />
+	</directory>
+	<directory name="ftp">
+		<xi:include href="ftp/ftp.rbuild" />
+	</directory>
+	<directory name="ipconfig">
+		<xi:include href="ipconfig/ipconfig.rbuild" />
+	</directory>
+	<directory name="net">
+		<xi:include href="net/net.rbuild" />
+	</directory>
+	<directory name="netstat">
+		<xi:include href="netstat/netstat.rbuild" />
+	</directory>
+	<directory name="nslookup">
+		<xi:include href="nslookup/nslookup.rbuild" />
+	</directory>
+	<directory name="ping">
+		<xi:include href="ping/ping.rbuild" />
+	</directory>
+	<directory name="route">
+		<xi:include href="route/route.rbuild" />
+	</directory>
+	<directory name="telnet">
+		<xi:include href="telnet/telnet.rbuild" />
+	</directory>
+	<directory name="tracert">
+		<xi:include href="tracert/tracert.rbuild" />
+	</directory>
+	<directory name="whois">
+		<xi:include href="whois/whois.rbuild" />
+	</directory>
+	<directory name="wlanconf">
+		<xi:include href="wlanconf/wlanconf.rbuild" />
+	</directory>
+</group>
--- a/base/applications/network/nslookup/nslookup.rbuild
+++ b/base/applications/network/nslookup/nslookup.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="nslookup" type="win32cui" installbase="system32" installname="nslookup.exe">
+	<include base="nslookup">.</include>
+	<library>user32</library>
+	<library>ws2_32</library>
+	<library>snmpapi</library>
+	<library>iphlpapi</library>
+	<file>nslookup.c</file>
+	<file>utility.c</file>
+	<file>nslookup.rc</file>
+</module>
--- a/base/applications/network/ping/lang/bg-BG.rc
+++ b/base/applications/network/ping/lang/bg-BG.rc
@@ -1,41 +0,0 @@
-/*
- * Превод на Български/ Bulgarian translation
- * http://www.reactos.org/wiki/Bulgarian_translation
- * LOCATION: \base\applications\network\ping\lang
- */
-
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_USAGE "\nУпотреба: ping [-t] [-n пъти] [-l размер] [-w просрочване] целеви_приемник\n\n\
-Възможности:\n\
-    -t             Прави пинг към указания приемник до прекъсване.\n\
-                   За прекъсване- натиснете Контрол+C.\n\
-    -n пъти        Колко пъти да бъдат подадени заявките.\n\
-    -l размер      Размер на изпращания буфер.\n\
-    -w просрочване Просрочване на чакането [милисекунди].\n\n\0"
-   
-    IDS_PING_WITH_BYTES             "\nПрави пинг %1 [%2] с %3!d! байта данни:\n\n\0"
-    IDS_PING_STATISTICS             "\nСтатистика за пинга за %1:\n\0"
-    IDS_PACKETS_SENT_RECEIVED_LOST  "    Пакети: пратени= %1!d!, получени= %2!d!, изгубени = %3!d! (%4!d!%% загуби),\n\0"
-    IDS_APPROXIMATE_ROUND_TRIP      "Приблизителна времетраене на приемо-предаването:\n\0"
-    IDS_MIN_MAX_AVERAGE             "    Най-малко= %1, Най-голямо= %2, Средно= %3\n\0"
-    IDS_NOT_ENOUGH_RESOURCES        "Няма достатъчно свободни средства.\n\0"
-    IDS_UNKNOWN_HOST                "Неизвестен приемник %1.\n\0"
-    IDS_SETSOCKOPT_FAILED           "Грешка при setsockopt (%1!d!).\n\0"
-    IDS_COULD_NOT_CREATE_SOCKET     "Грешка при създаване на гнездо (#%1!d!).\n\0"
-    IDS_COULD_NOT_INIT_WINSOCK      "Грешка при подкаравнето на библиотеката (dll) за winsock.\n\0"
-    IDS_DEST_MUST_BE_SPECIFIED      "Трябва да укажете името или IP адреса на целевият приемник.\n\0"
-    IDS_BAD_PARAMETER               "Неправилен параметър %1.\n\0"
-    IDS_BAD_OPTION_FORMAT           "Неправилно записване на възможността %1.\n\0"
-    IDS_BAD_OPTION                  "Неправилна стойност %1.\n\0"
-    IDS_BAD_VALUE_OPTION_L          "Неправилна стойност за -l, допустимите са от 0 до %1!d!.\n\0"
-    IDS_REPLY_FROM                  "Отговор от %1: байта=%2!d! време%3%4 ВЖ(TTL)=%5!d!\n\0"
-    IDS_DEST_UNREACHABLE            "Целевия приемник е недостижим.\n\0"
-    IDS_COULD_NOT_TRANSMIT          "Грешка при предаване на данните (%1!d!).\n\0"
-    IDS_COULD_NOT_RECV              "Грешка при получаване на данните (%1!d!).\n\0"
-    IDS_REQUEST_TIMEOUT             "Заявката е просрочена.\n\0"
-    IDS_MS                          "мс\0"
-    IDS_1MS                         "1 мс\0"
-END
--- a/base/applications/network/ping/ping.rbuild
+++ b/base/applications/network/ping/ping.rbuild
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="ping" type="win32cui" installbase="system32" installname="ping.exe" unicode="true">
+	<include base="ping">.</include>
+	<define name="__USE_W32_SOCKETS" />
+	<library>ws2_32</library>
+	<file>ping.c</file>
+	<file>ping.rc</file>
+</module>
--- a/base/applications/network/ping/ping.rc
+++ b/base/applications/network/ping/ping.rc
@@ -9,36 +9,13 @@

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/pl-PL.rc"
+#include "lang/ro-RO.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/network/route/route.rbuild
+++ b/base/applications/network/route/route.rbuild
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="route" type="win32cui" installbase="system32" installname="route.exe" unicode="yes">
+	<include base="route">.</include>
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<file>route.c</file>
+	<file>route.rc</file>
+</module>
--- a/base/applications/network/telnet/telnet.rbuild
+++ b/base/applications/network/telnet/telnet.rbuild
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" >
+	<include base="telnet">.</include>
+	<library>ws2_32</library>
+	<library>user32</library>
+	<define name="_CRT_NONSTDC_NO_DEPRECATE" />
+	<directory name="src">
+		<file>ansiprsr.cpp</file>
+		<file>keytrans.cpp</file>
+		<file>tcharmap.cpp</file>
+		<file>tconsole.cpp</file>
+		<file>tkeydef.cpp</file>
+		<file>tkeymap.cpp</file>
+		<file>tmapldr.cpp</file>
+		<file>tmouse.cpp</file>
+		<file>tnclass.cpp</file>
+		<file>tnclip.cpp</file>
+		<file>tncon.cpp</file>
+		<file>tnconfig.cpp</file>
+		<file>tnerror.cpp</file>
+		<file>tnetwork.cpp</file>
+		<file>tnmain.cpp</file>
+		<file>tnmisc.cpp</file>
+		<file>tscript.cpp</file>
+		<file>tscroll.cpp</file>
+		<file>ttelhndl.cpp</file>
+	</directory>
+	<file>telnet.rc</file>
+</module>
--- a/base/applications/network/tracert/tracert.rbuild
+++ b/base/applications/network/tracert/tracert.rbuild
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe">
+	<include base="tracert">.</include>
+	<define name="__USE_W32_SOCKETS" />
+	<library>ws2_32</library>
+	<file>tracert.c</file>
+	<file>tracert.rc</file>
+</module>
--- a/base/applications/network/whois/whois.rbuild
+++ b/base/applications/network/whois/whois.rbuild
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="whois" type="win32cui" installbase="system32" installname="whois.exe">
+	<include base="whois">.</include>
+	<library>ws2_32</library>
+	<file>whois.c</file>
+	<file>whois.rc</file>
+</module>
--- a/base/applications/network/wlanconf/wlanconf.rbuild
+++ b/base/applications/network/wlanconf/wlanconf.rbuild
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="wlanconf" type="win32cui" installbase="system32" installname="wlanconf.exe">
+	<include base="wlanconf">.</include>
+	<include base="ReactOS">include/reactos/drivers/ndisuio</include>
+	<library>iphlpapi</library>
+	<file>wlanconf.c</file>
+	<file>wlanconf.rc</file>
+</module>
--- a/base/applications/notepad/notepad.rbuild
+++ b/base/applications/notepad/notepad.rbuild
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="notepad" type="win32gui" installbase="system32" installname="notepad.exe" unicode="yes">
+	<include base="notepad">.</include>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>comdlg32</library>
+	<library>comctl32</library>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<file>dialog.c</file>
+	<file>main.c</file>
+	<file>text.c</file>
+	<file>settings.c</file>
+	<file>rsrc.rc</file>
+	<pch>notepad.h</pch>
+</module>
--- a/base/applications/notepad/rsrc.rc
+++ b/base/applications/notepad/rsrc.rc
@@ -36,87 +36,31 @@ IDI_NPICON ICON "res/notepad.ico"

 // UTF-8
 #pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DA_DK
-    #include "lang/da-DK.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_EU_ES
-    #include "lang/eu-ES.rc"
-#endif
-#ifdef LANGUAGE_FI_FI
-    #include "lang/fi-FI.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_HU_HU
-    #include "lang/hu-HU.rc"
-#endif
-#ifdef LANGUAGE_HY_AM
-    #include "lang/hy-AM.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_LT_LT
-    #include "lang/lt-LT.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "lang/nl-NL.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_PT
-    #include "lang/pt-PT.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SL_SI
-    #include "lang/sl-SI.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_TH_TH
-    #include "lang/th-TH.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
+#include "lang/bg-BG.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/da-DK.rc"
+#include "lang/de-DE.rc"
+#include "lang/el-GR.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/eu-ES.rc"
+#include "lang/fi-FI.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/hy-AM.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/lt-LT.rc"
+#include "lang/nl-NL.rc"
+#include "lang/no-NO.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-PT.rc"
+#include "lang/ro-RO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"
+#include "lang/sk-SK.rc"
+#include "lang/sl-SI.rc"
+#include "lang/sv-SE.rc"
+#include "lang/th-TH.rc"
+#include "lang/zh-CN.rc"
--- a/base/applications/rapps/lang/bg-BG.rc
+++ b/base/applications/rapps/lang/bg-BG.rc
@@ -1,7 +1,3 @@
-/* Превод на Български/ Bulgarian translation */
-/* http://www.reactos.org/wiki/Bulgarian_translation */
-/* LOCATION: \base\applications\rapps\lang */
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 IDR_MAINMENU MENU
@@ -189,8 +185,8 @@ BEGIN
 	IDS_UPDATES "Обновления"
 	IDS_APPLICATIONS "Приложения"
 	IDS_CHOOSE_FOLDER_TEXT "Изберете папка, в която да се свалят приложенията:"
-	IDS_CHOOSE_FOLDER_ERROR "Указали сте несъществуваща папка!"
-	IDS_USER_NOT_ADMIN "Трябва да имате управнически права, за да запуснете „Управителя за приложения на РеактОС“!"
+	IDS_CHOOSE_FOLDER_ERROR "Указали сте несъсшествуваща папка!"
+	IDS_USER_NOT_ADMIN "You should be administrator for start ""Управителят за приложения на РеактОС""!"
 	IDS_APP_REG_REMOVE "Уверен ли сте, че искате да изтриете данните за сложеното приложение от регистъра?"
 	IDS_INFORMATION "Сведения"
 	IDS_UNABLE_TO_REMOVE "Премахването на данните за приложението от регистъра е невъзможно!"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Faber	245051f2bf	[CLT2012] - Fix directory creation in first stage - Avoid relocation of syssetup svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56139	2012-03-13 09:04:26 +00:00
Thomas Faber	4cb64ace63	[CLT2012] - Remove the outdated USB driver svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56138	2012-03-13 00:08:45 +00:00
Thomas Faber	05577a9a89	[CLT2012] - Include the Lautus visual style by Pisarz (as a blob for now), and enable it by default svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56136	2012-03-12 22:50:39 +00:00
Thomas Faber	7f2624f282	[CLT2012] - Add CLT wallpaper based on Angelus_ReactOS7_Dark_4-3 svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56134	2012-03-12 16:06:54 +00:00
Thomas Faber	77b07c3a96	[CLT2012] - Partly revert r53422 to allow hybrid CD booting again. Thanks to Giannis. svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56123	2012-03-11 21:09:16 +00:00
Thomas Faber	76a461dd16	[CLT2012] - Add hybrid CD tools by Colin. See r51077, r46059 svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56101	2012-03-10 09:41:41 +00:00
Thomas Faber	18ac12569f	[CLT2012] - Adjust the CD root readme.txt for CLT - Add CD options to welcome.exe - Taken from previous years, see r51078, r46065 svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56100	2012-03-10 09:38:41 +00:00
Thomas Faber	ee9c5e2290	[CLT2012] - Change version to 0.3.14-CLT2012 svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56095	2012-03-09 19:28:53 +00:00
Cameron Gutman	5a288c9f90	[NTOSKRNL] - Add an assertion to catch a bug in the I/O manager svn path=/trunk/; revision=56093	2012-03-08 23:02:45 +00:00
Stefan Ginsberg	ad0cb34f20	- Addendum to 56090. svn path=/trunk/; revision=56092	2012-03-08 09:23:24 +00:00
Stefan Ginsberg	12d6452264	Build fix from the cmake noob. svn path=/trunk/; revision=56091	2012-03-08 09:20:31 +00:00
Stefan Ginsberg	1016fc25ff	- Fix DBG macro AGAIN which got broken during the switch to cmake. Checked build: DBG = 1, free build: DBG = 0. Noobs. svn path=/trunk/; revision=56090	2012-03-08 09:18:28 +00:00
Cameron Gutman	a7caca2e37	[NTOSKRNL] - Release the IO database lock before unloading the device (and driver too) to prevent deadlocks svn path=/trunk/; revision=56089	2012-03-08 03:02:28 +00:00
Cameron Gutman	e0c8eedd51	[NTOSKRNL] - Fix broken reference counting and dereferencing the wrong device object svn path=/trunk/; revision=56088	2012-03-08 02:58:21 +00:00
Cameron Gutman	592be28128	[NTOSKRNL] - Dereference the correct device object (the one who asked for shutdown notification) instead of whatever happens to be on the top of the device stack - Fix flag issues svn path=/trunk/; revision=56087	2012-03-08 02:43:47 +00:00
James Tabor	f3bea9c548	[Screen Savers] - CMake it! MazeScr is skipped for now. svn path=/trunk/; revision=56086	2012-03-08 02:02:58 +00:00
Amine Khaldi	6c70734db8	* Fix wallpaper names in reactos.dff. svn path=/branches/ros-branch-0_3_14/; revision=55444	2012-02-05 22:33:16 +00:00
Rafal Harabien	ac08c3201c	- Update dff to include new wallpapers svn path=/branches/ros-branch-0_3_14/; revision=55443	2012-02-05 21:19:26 +00:00
Amine Khaldi	b5d2889fe6	* Merge r55430 from trunk. svn path=/branches/ros-branch-0_3_14/; revision=55436	2012-02-05 17:50:42 +00:00
Amine Khaldi	842eead3d3	* Merge r55432 from trunk. svn path=/branches/ros-branch-0_3_14/; revision=55435	2012-02-05 17:27:26 +00:00
Amine Khaldi	34f85f1924	* Properly set the default wallpaper for both bootcd and livecd. Missed this file in the previous commit. svn path=/branches/ros-branch-0_3_14/; revision=55434	2012-02-05 17:26:22 +00:00
Rafal Harabien	eb0a5bb375	- Update Start Menu bitmaps to contain a proper version number instead of "0.4 - SVN" svn path=/branches/ros-branch-0_3_14/; revision=55428	2012-02-05 14:27:44 +00:00
Amine Khaldi	5e27501533	* Adjust wallpapers names and convert them to bmp. * Properly set the default wallpaper for both bootcd and livecd. svn path=/branches/ros-branch-0_3_14/; revision=55427	2012-02-05 14:12:32 +00:00
Ziliang Guo	84efd2dcf8	Merge in r55173 as per Amine's request. Also apply Cameron's patch that attempts to hack around the memory manager bug. svn path=/branches/ros-branch-0_3_14/; revision=55388	2012-02-03 03:51:58 +00:00
Ziliang Guo	0392d3b913	Initial pass at adding wallpapers. svn path=/branches/ros-branch-0_3_14/; revision=55371	2012-02-02 01:30:25 +00:00
Ziliang Guo	551ad41c6e	Merge r55012 adding Wine3D control panel as per Amine's request. svn path=/branches/ros-branch-0_3_14/; revision=55363	2012-02-01 04:58:00 +00:00
Ziliang Guo	483bd4cbff	Really update the release version this time. svn path=/branches/ros-branch-0_3_14/; revision=55344	2012-01-31 01:41:32 +00:00
Ziliang Guo	29bb3f9591	Change version string to release header for rbuild. Next time we release, do this in the cmake file. svn path=/branches/ros-branch-0_3_14/; revision=55331	2012-01-30 18:23:14 +00:00
Amine Khaldi	60eea2d779	* Branch for the 0.3.14 release. svn path=/branches/ros-branch-0_3_14/; revision=55011	2012-01-19 15:13:24 +00:00
Colin Finck	2ad47f0104	- Change the root "readme.txt" file to have a CLT2011 text. - Add all CD options to "welcome.exe", modify its code a bit to support this. This is all stuff which has already been done last year, see r46065. svn path=/branches/ros-branch-0_3_13-clt2011/; revision=51078	2011-03-16 23:19:36 +00:00
Colin Finck	77565b18aa	Import my Hybrid-CD stuff from last year. Hopefully the kernel hack is not required anymore.. svn path=/branches/ros-branch-0_3_13-clt2011/; revision=51077	2011-03-16 22:34:40 +00:00
Colin Finck	93e878aefe	Add the CLT2011 wallpaper (2/2) svn path=/branches/ros-branch-0_3_13-clt2011/; revision=51076	2011-03-16 22:14:40 +00:00
Colin Finck	86ee618d32	Add the CLT2011 wallpaper (1/2) svn path=/branches/ros-branch-0_3_13-clt2011/; revision=51075	2011-03-16 22:12:30 +00:00
Colin Finck	bca2d0d658	Change version to 0.3.13-CLT2011 svn path=/branches/ros-branch-0_3_13-clt2011/; revision=51074	2011-03-16 21:33:38 +00:00
Colin Finck	03dc76ef23	Merge 51053, 51069 svn path=/branches/ros-branch-0_3_13/; revision=51070	2011-03-16 16:57:58 +00:00
Colin Finck	43903288f4	Merge r51067 svn path=/branches/ros-branch-0_3_13/; revision=51068	2011-03-16 16:17:03 +00:00
Colin Finck	bdd21d454d	Hackfix for Far 1.65. Although the file manager didn't become fully usable with this patch, it works better than without and the patch doesn't seem to have negative side effects. See issue #5503 for more details. svn path=/branches/ros-branch-0_3_13/; revision=51066	2011-03-16 15:09:31 +00:00
Colin Finck	d4028b14b9	Merge 51058, 51062-51063 svn path=/branches/ros-branch-0_3_13/; revision=51064	2011-03-16 14:08:30 +00:00
Colin Finck	f7404c57db	Merge r51046-r51048 svn path=/branches/ros-branch-0_3_13/; revision=51049	2011-03-14 14:58:36 +00:00
Colin Finck	867a0ff468	Merge r51043 and r51044 svn path=/branches/ros-branch-0_3_13/; revision=51045	2011-03-13 22:10:29 +00:00
Colin Finck	03c991f93b	Revert r51031 [13:43] <smiley1_> fuck [13:44] <smiley1_> INVALID_KERNEL_HANDLE ?!? [13:45] <smiley1_> Caemyr: after my latest commit 5 tests end with this bugcheck svn path=/branches/ros-branch-0_3_13/; revision=51040	2011-03-13 18:05:43 +00:00
Colin Finck	9cccfb8a2d	Get rid of the "old boot method" entries. In contrast to my previous commit, this should indeed be merged to Trunk, but please don't forget to get rid of the corresponding FreeLDR code as well then. svn path=/branches/ros-branch-0_3_13/; revision=51038	2011-03-13 17:54:42 +00:00
Colin Finck	d2eb058174	- Change the version to 0.3.13 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to RApps to the Desktop - Change the boot logo to update the copyright year. Done with GIMP this time as it was one of the few tools to create proper 4-bit RLE files. This logo shall not be merged back to Trunk, because Aleksey wants to have another bitmap ready by the next release. svn path=/branches/ros-branch-0_3_13/; revision=51037	2011-03-13 17:49:31 +00:00
Colin Finck	7223cdea1f	Scale down the wallpaper to 800x600. For some reason, scaling down the image through the "Stretch" option of the Desktop doesn't seem to work. svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46087	2010-03-11 00:01:33 +00:00
Colin Finck	68a571a5eb	Use a different wallpaper for CLT2010 (2/2) svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46082	2010-03-10 22:42:35 +00:00
Colin Finck	90d4bdb342	Use a different wallpaper for CLT2010 (1/2) svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46081	2010-03-10 22:39:41 +00:00
Colin Finck	fa76f34fd4	Merge 45535 (the big RosBE 1.5 compatibility patch) This branch HAS to be built with the current RosBE version now. svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46070	2010-03-10 19:45:47 +00:00
Colin Finck	b5b864a3c6	Combine the Step1/Step2 creation of the Hybrid-CD. Extra stuff can be added to the directory "hybridcd_extras" now. svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46066	2010-03-10 18:17:50 +00:00
Colin Finck	17cecb05e3	Update the root "readme.txt" of the CD and the "welcome.exe" app to show more options. This is also stuff, which was mostly done by Andrew Greenwood for FOSDEM last year. I just changed it for our needs. svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46065	2010-03-10 17:46:49 +00:00
Colin Finck	fc77cd5e6c	- Add a script for creating a Hybrid-CD (combined Boot-CD & Live-CD). Kudos for this go to Andrew Greenwood, I just scripted his way of creating the disc. - Combining them also requires changing the Live-CD directory in the kernel to "live", which renders regular Live-CDs created in this tree unbootable. svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46059	2010-03-10 16:05:55 +00:00
Colin Finck	3344531228	Merge 45730 (rapps link fix) svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46057	2010-03-10 14:33:36 +00:00
Colin Finck	5c260d2745	Backport the new boot and shutdown screen and slightly modify it for extra awesomeness! :-) This includes: - Merging 45269,45270,45614,45618,45619,45822,45966. - Hardcoding NtProductWinNt instead of NtProductServer as the product type. I didn't merge the new code for this as I'm not sure about its dependencies. - Changing 1.bmp and 6.bmp for CLT2010. svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46055	2010-03-10 14:25:05 +00:00
Colin Finck	ccd44d9ac4	Change the copyright year as well. svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46032	2010-03-09 13:42:12 +00:00
Colin Finck	37c48ca11e	Change version to 0.3.11-CLT2010 svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46031	2010-03-09 13:27:53 +00:00
Colin Finck	ed469a00af	Merge r44552 svn path=/branches/ros-branch-0_3_11/; revision=44553	2009-12-12 17:15:19 +00:00
Colin Finck	f2c93ea2b8	Here comes ReactOS "FOR WORKGROUPS" 0.3.11! :-) svn path=/branches/ros-branch-0_3_11/; revision=44531	2009-12-10 23:19:12 +00:00
Colin Finck	1b51adc031	Revert to the old boot method for the release on request of Aleksey svn path=/branches/ros-branch-0_3_11/; revision=44367	2009-12-02 20:02:07 +00:00
Aleksey Bragin	5911400ccc	- Merge 44348 and 44349 to 0.3.11 branch. svn path=/branches/ros-branch-0_3_11/; revision=44350	2009-12-01 21:36:23 +00:00
Aleksey Bragin	68d04648a4	- Merge 44301 (network revert). svn path=/branches/ros-branch-0_3_11/; revision=44336	2009-11-30 21:52:07 +00:00
Colin Finck	0b321cfcbf	Revert 43921 on demand of Aleksey svn path=/branches/ros-branch-0_3_11/; revision=44316	2009-11-28 22:54:47 +00:00
Colin Finck	0127705606	Dmitry Gorbachev: - Replace our Japanese "Systema" font added for releases by "Droid Sans Fallback" from the Android project. This font is licensed under Apache 2.0 license (notice included) and also offers us Chinese and Korean characters. You have to copy "DroidSansFallback.ttf" from http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts to "modules/optional". svn path=/branches/ros-branch-0_3_11/; revision=44305	2009-11-28 15:04:15 +00:00
Colin Finck	79c56c5d7b	Hack: Add the APPDATA variable to the environment created by userenv as it was done for previous releases. svn path=/branches/ros-branch-0_3_11/; revision=44300	2009-11-28 00:29:52 +00:00
Colin Finck	9123974a75	Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases svn path=/branches/ros-branch-0_3_11/; revision=44299	2009-11-28 00:17:11 +00:00
Colin Finck	583c59f82e	- Change the version to 0.3.11 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to RApps to the Desktop svn path=/branches/ros-branch-0_3_11/; revision=44298	2009-11-28 00:14:56 +00:00