- move platform settings like included build languages to a user configurable rbuild file with fallback to platform.template.rbuild if no one is present.

svn path=/branches/rbuild/; revision=33684

reactos/CREDITS

@@ -1,69 +0,0 @@
-ReactOS is available thanks to the work of:
-
-Aleksey Bragin <aleksey at reactos org>
-Alex Ionescu <alex.ionescu@reactos.org>
-Andrew Greenwood <lists@silverblade.co.uk>
-Andrew Munger <waxdragon@gmail.com>
-Arindam Das
-Art Yerkes <ayerkes@speakeasy.net>
-Ariadne
-Brandon Turner (turnerb7@msu.edu)
-Brian Palmer <brianp@sginet.com>
-Casper S. Hornstrup <chorns@users.sourceforge.net>
-Christoph von Wittich (christoph_vw@reactos.org)
-David Welch <welch@cwcom.net>
-Emanuele Aliberti <ea@iol.it>
-Eric Kohl <ekohl@rz-online.de>
-Eugene Ingerman <geneing@myrealbox.com>
-Filip Navara <xnavara@volny.cz>
-Frederik Leemans
-Ge van Geldorp <ge@gse.nl>
-Ged Murphy <gedmurphy@reactos.org>
-Guido de Jong
-Gunnar Andre' Dalsnes <hardon@online.no>
-Hans Kremer
-Hartmut Birr <hartmut.birr@gmx.de>
-Hernan Ochoa
-Herve Poussineau <hpoussin@reactos.com>
-Iwan Fatahi <i_fatahi@hotmail.com>
-James B. Tabor <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
-Jason Eager
-Jason Filby <jasonfilby@yahoo.com>
-Jason Weiler
-Jean Michault
-Jim Noeth
-Johannes Anderwald <johannes.anderwald@student.tugraz.at> 
-Jonathan Wilson <jonwil@tpgi.com.au>
-Jurgen van Gael <jurgen.vangael@student.kuleuven.ac.be>
-KJK::Hyperion <noog@libero.it>
-Klemens R. Friedl <klemens_friedl@gmx.net>
-Maarten Bosma <maarten.paul@bosma.de>
-Magnus Olsen (magnus@greatlord.com)
-Mark Tempel <mtempel@visi.com>
-Mark Weaver <mark@npsl.co.uk>
-Martin Fuchs <martin-fuchs@gmx.net>
-Marty Dill <mdill@uvic.ca>
-Matt Pyne
-Mike Nordell ("tamlin")
-Nathan Woods <npwoods@mess.org>
-Pablo Borobia <pborobia@gmail.com>
-Paolo Pantaleo <paolopan@freemail.it>
-Phillip Susi <phreak@iag.net>
-Rex Jolliff <rex@lvcablemodem.com>
-Richard Campbell <betam4x@gmail.com>
-Robert Bergkvist <fragdance@hotmail.com>
-Robert Dickenson <robd@reactos.org>
-Royce Mitchell III <royce3@ev1.net>
-Saveliy Tretiakov <saveliyt@mail.ru>
-Steven Edwards <steven_ed4153@yahoo.com>
-Thomas Weidenmueller <w3seek@users.sourceforge.net>
-Timo Kreuzer <timo.kreuzer@reactos.org>
-Victor Kirhenshtein <sauros@iname.com>
-Vizzini <vizzini@plasmic.com>
-
-
-Graphic Design from
-
-Mindflyer <mf@mufunyo.net> 
-Tango Desktop Project (http://tango-project.org)
-Everaldo (http://everaldo.com)

reactos/Makefile

@@ -38,7 +38,7 @@
 #        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.auto if needed.
+#        missing makefile-{ROS_ARCH}.auto if needed.
 #
 #    module_depends
 #        These targets do a dependency check of individual modules. Replace module
@@ -46,6 +46,8 @@
 #        This is faster than the depends target which does a complete dependency
 #        check of the ReactOS codebase.
 #
+#    families
+#        A list will be shown with all available build families.
 #
 # Accepted environment variables:
 #
@@ -65,13 +67,13 @@
 #        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-i386.
+#        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-i386.
+#        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.
@@ -89,7 +91,7 @@
 #    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 .\reactos.
+#        defaults to .\{ROS_CDOUTPUT}.
 #
 #    ROS_BUILDMAP
 #        This variable controls if map files are to be generated for executable
@@ -147,6 +149,12 @@ endif
 .PHONY: world
 .PHONY: universe
 
+ifneq ($(ROS_ARCH),)
+  ARCH := $(ROS_ARCH)
+else
+  ARCH := i386
+endif
+
 ifeq ($(ROS_AUTOMAKE),)
 ROS_AUTOMAKE=makefile.auto
 endif
@@ -161,15 +169,15 @@ ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
 ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
 export OSTYPE = msys
 HOST=mingw32-linux
-CFLAGS+=-fshort-wchar
-CPPFLAGS+=-fshort-wchar
+HOST_CFLAGS+=-fshort-wchar
+HOST_CPPFLAGS+=-fshort-wchar
 else
 HOST=mingw32-windows
 endif
 else
 HOST=mingw32-linux
-CFLAGS+=-fshort-wchar
-CPPFLAGS+=-fshort-wchar
+HOST_CFLAGS+=-fshort-wchar
+HOST_CPPFLAGS+=-fshort-wchar
 endif
 endif
 
@@ -254,12 +262,50 @@ else
   ECHO_STRIP   =
 endif
 
-
-host_gcc = $(Q)gcc
-host_gpp = $(Q)g++
+# 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)
+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)
 	export EXEPREFIX = ./
 	ifeq ($(OSTYPE),msys)
@@ -269,30 +315,10 @@ else
 	endif
 	export SEP = /
 	mkdir = -$(Q)mkdir -p
-	gcc = $(Q)$(PREFIX)-gcc
-	gpp = $(Q)$(PREFIX)-g++
-	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
 	rm = $(Q)rm -f
 	cp = $(Q)cp
 	NUL = /dev/null
 else # mingw32-windows
-	ifeq ($(OSTYPE),msys)
-		HOST=mingw32-linux
-		export EXEPREFIX = ./
-		export EXEPOSTFIX = .exe
-		export SEP = /
-		mkdir = -$(Q)mkdir -p
-		rm = $(Q)rm -f
-		cp = $(Q)cp
-		NUL = /dev/null
-	else
 	export EXEPREFIX =
 	export EXEPOSTFIX = .exe
 	ROS_EMPTY =
@@ -302,57 +328,19 @@ else # mingw32-windows
 	cp = $(Q)copy /y
 	NUL = NUL
 endif
-	ifeq ($(ROS_PREFIX),)
-		gcc = $(Q)gcc
-		gpp = $(Q)g++
-		ld = $(Q)ld
-		nm = $(Q)nm
-		objdump = $(Q)objdump
-		ar = $(Q)ar
-		objcopy = $(Q)objcopy
-		dlltool = $(Q)dlltool
-		strip = $(Q)strip
-		windres = $(Q)windres
-	else
-		gcc = $(Q)$(ROS_PREFIX)-gcc
-		gpp = $(Q)$(ROS_PREFIX)-g++
-		ld = $(Q)$(ROS_PREFIX)-ld
-		nm = $(Q)$(ROS_PREFIX)-nm
-		objdump = $(Q)$(ROS_PREFIX)-objdump
-		ar = $(Q)$(ROS_PREFIX)-ar
-		objcopy = $(Q)$(ROS_PREFIX)-objcopy
-		dlltool = $(Q)$(ROS_PREFIX)-dlltool
-		strip = $(Q)$(ROS_PREFIX)-strip
-		windres = $(Q)$(ROS_PREFIX)-windres
-	endif
-endif
-
-ifneq ($(ROS_ARCH),)
-  ARCH := $(ROS_ARCH)
-else
-  ARCH := i386
-endif
 
 ifneq ($(ROS_INTERMEDIATE),)
   INTERMEDIATE := $(ROS_INTERMEDIATE)
-else
-  ifneq ($(ROS_CDOUTPUT),)
-    INTERMEDIATE := obj-$(ROS_CDOUTPUT)
 else
   INTERMEDIATE := obj-$(ARCH)
 endif
-endif
 INTERMEDIATE_ := $(INTERMEDIATE)$(SEP)
 
 ifneq ($(ROS_OUTPUT),)
   OUTPUT := $(ROS_OUTPUT)
-else
-  ifneq ($(ROS_CDOUTPUT),)
-    OUTPUT := output-$(ROS_CDOUTPUT)
 else
   OUTPUT := output-$(ARCH)
 endif
-endif
 OUTPUT_ := $(OUTPUT)$(SEP)
 
 ifneq ($(ROS_CDOUTPUT),)
@@ -365,18 +353,14 @@ CDOUTPUT_ := $(CDOUTPUT)$(SEP)
 ifneq ($(ROS_TEMPORARY),)
   TEMPORARY := $(ROS_TEMPORARY)
 else
-  TEMPORARY :=
+  TEMPORARY := .
 endif
 TEMPORARY_ := $(TEMPORARY)$(SEP)
 
 ifneq ($(ROS_INSTALL),)
   INSTALL := $(ROS_INSTALL)
 else
-  ifneq ($(ROS_CDOUTPUT),)
-    INSTALL := reactos.$(ROS_CDOUTPUT)
-  else
-    INSTALL := reactos
-  endif
+  INSTALL := $(CDOUTPUT)
 endif
 INSTALL_ := $(INSTALL)$(SEP)
 
@@ -415,8 +399,11 @@ PREAUTO := \
 	$(ERRCODES_RC) \
 	$(GENDIB_DIB_FILES) \
 	$(NCI_SERVICE_FILES)
+ifeq ($(ARCH),powerpc)
+PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS)
+endif
 
-$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
+$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(XMLBUILDFILES) | $(PREAUTO)
 	${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
@@ -444,26 +431,8 @@ universe:
 		world
 
 sysregtest:
-	-mkdir $(OUTPUT_)cd$(SEP)reactos
-	$(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample boot$(SEP)bootdata$(SEP)unattend.inf
-	$(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf
-	$(cp) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat.sample boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat
-	$(MAKE) dbgprint
-	$(MAKE) bootcdregtest
-	$(MAKE) sysreg
-	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg rosboot
-	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)secstage.cfg rosboot
-	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)runonce.cfg rosboot
+	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg
 
-sysregtest_clean:
-	$(rm) boot$(SEP)bootdata$(SEP)unattend.inf
-	$(rm) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat
-	$(rm) $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf
-
-regtest:
-	$(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf
-	$(MAKE) bootcdregtest
-	$(rm) $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf
 
 .PHONY: cb
 cb: $(RBUILD_TARGET)

reactos/ReactOS-generic.rbuild

@@ -0,0 +1,78 @@
+<?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" />
+	<xi:include href="buildfamilies.rbuild" />
+	<xi:include href="contributors.rbuild" />
+	<xi:include href="installfolders.rbuild" />
+	<xi:include href="languages.rbuild" />
+
+	<define name="__REACTOS__" overridable="true" />
+	<if property="MP" value="1">
+		<define name="CONFIG_SMP">1</define>
+	</if>
+	<if property="DBG" value="1">
+		<define name="DBG">1</define>
+		<define name="_SEH_ENABLE_TRACE" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	<if property="KDBG" value="1">
+		<define name="KDBG">1</define>
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+
+	<include>.</include>
+	<include>include</include>
+	<include root="intermediate">include</include>
+	<include>include/psdk</include>
+	<include root="intermediate">include/psdk</include>
+	<include>include/dxsdk</include>
+	<include>include/crt</include>
+	<include>include/crt/mingw32</include>
+	<include>include/ddk</include>
+	<include>include/GL</include>
+	<include>include/ndk</include>
+	<include>include/reactos</include>
+	<include root="intermediate">include/reactos</include>
+	<include>include/reactos/libs</include>
+
+	<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" />
+	</directory>
+	<directory name="subsystems">
+		<xi:include href="subsystems/subsystems.rbuild" />
+	</directory>
+
+	<xi:include href="platform.rbuild">
+		<xi:fallback>
+			<xi:include href="platform.template.rbuild" />
+		</xi:fallback>
+	</xi:include>
+</group>

reactos/ReactOS-i386.rbuild

@@ -1,30 +1,19 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile.auto" architecture="i386" 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="baseaddress.rbuild" />
+	<xi:include href="ReactOS-generic.rbuild" />
 
 	<define name="_M_IX86" />
 	<define name="_X86_" />
 	<define name="__i386__" />
-  <define name="_REACTOS_" />
-  <if property="MP" value="1">
-    <define name="CONFIG_SMP" value="1" />
-  </if>
-  <if property="DBG" value="1">
-    <define name="DBG" value="1" />
-	<define name="_SEH_ENABLE_TRACE" />
-    <property name="DBG_OR_KDBG" value="true" />
-  </if>
-  <if property="KDBG" value="1">
-    <define name="KDBG" value="1" />
-    <property name="DBG_OR_KDBG" value="true" />
-  </if>
+
+	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
 	
 	<if property="GDB" value="0">
 		<if property="OPTIMIZE" value="1">
@@ -54,53 +43,4 @@
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
 	<compilerflag>-Wpointer-arith</compilerflag>
 	<linkerflag>-enable-stdcall-fixup</linkerflag>
-
-  <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>include/crt</include>
-  <include>include/ddk</include>
-  <include>include/GL</include>
-  <include>include/ndk</include>
-  <include>include/reactos</include>
-  <include root="intermediate">include/reactos</include>
-  <include>include/reactos/libs</include>
-
-  <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" />
-  </directory>
-  <directory name="subsystems">
-    <xi:include href="subsystems/subsystems.rbuild" />
-  </directory>
-
 </project>

reactos/ReactOS-ppc.rbuild

@@ -1,94 +1,40 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile.ppc" architecture="powerpc" 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="baseaddress.rbuild" />
-
-  <property name="BOOTPROG_PREPARE" value="ppc-le2be" />
-  <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" />
-  <property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" />
-  <property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" />
+	<xi:include href="ReactOS-generic.rbuild" />
 
 	<define name="_M_PPC" />
 	<define name="_PPC_" />
 	<define name="__PowerPC__" />
-  <define name="_REACTOS_" />
-  <define name="__MINGW_IMPORT" empty="true" />
-  <define name="stdcall" empty="true" />	
-  <define name="__stdcall__" empty="true" />
-  <define name="fastcall" empty="true" />
-  <define name="cdecl" empty="true" />
-  <define name="__cdecl__" empty="true" />
-  <define name="dllimport" empty="true" />
-  <compilerflag>-v</compilerflag>
-  <if property="MP" value="1">
-    <define name="CONFIG_SMP" value="1" />
-  </if>
-  <if property="DBG" value="1">
-    <define name="DBG" value="1" />
-    <property name="DBG_OR_KDBG" value="true" />
-  </if>
-  <if property="DBG" value="0">
-    <compilerflag>-Os</compilerflag>
+
+	<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"/>
+
+	<define name="stdcall"/>
+	<define name="__stdcall__"/>
+	<define name="fastcall"/>
+	<define name="cdecl"/>
+	<define name="__cdecl__"/>
+	<define name="dllimport"/>
+	<define name="WORDS_BIGENDIAN"/>
+	<define name="__MSVCRT__"/>
+	<define name="__NO_CTYPE_INLINES" />
+	<!-- <define name="__DECLSPEC_SUPPORTED" /> -->
+	<define name="__MINGW_IMPORT">extern</define>
+	<define name="_CRTIMP"/>
+	<define name="'__declspec(x)'"/>
+	<compilerflag>-fshort-wchar</compilerflag>
+	<compilerflag>-fsigned-char</compilerflag>
+	<compilerflag>-mfull-toc</compilerflag>
+	<compilerflag>-meabi</compilerflag>
+	<compilerflag>-O2</compilerflag>
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
-  </if>
-  <if property="KDBG" value="1">
-    <define name="KDBG" value="1" />
-    <property name="DBG_OR_KDBG" value="true" />
-  </if>
-  <compilerflag>-Wpointer-arith</compilerflag>
-
-  <include>.</include>
-  <include>include</include>
-  <include>include/reactos</include>
-  <include>include/libs</include>
-  <include>include/drivers</include>
-  <include>include/subsys</include>
-  <include>include/ndk</include>
-  <include>include</include>
-  <include>include/crt</include>
-  <include>include/ddk</include>
-
-  <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" />
-  </directory>
-  <directory name="regtests">
-    <xi:include href="regtests/directory.rbuild" />
-  </directory>  
-  <directory name="subsystems">
-    <xi:include href="subsystems/subsystems.rbuild" />
-  </directory>
 
 </project>

reactos/base/applications/applications.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<group>
+<!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>

reactos/base/applications/cacls/cacls.rbuild

@@ -1,3 +1,5 @@
+<?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>
 	<define name="__USE_W32API" />

reactos/base/applications/cacls/lang/ca-ES.rc

@@ -0,0 +1,74 @@
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_HELP, "Mostra o modifica la llista de control d'acc<63>s (ACLs) dels fitxers\n\n\
+CACLS fitxer [/T] [/E] [/C] [/G user:perm [...]] [/R usuari [...]]\n\
+               [/P user:perm [...]] [/D usuari [...]]\n\
+   fitxer        Mostra ACLs.\n\
+   /T            Canvia el ACLs dels fitxers especificats al\n\
+                 directori actual i tots els seus subdirectoris.\n\
+   /E            Edita ACL en comptes de substituir-lo.\n\
+   /C            Continua en cas d'error d'acc<63>s.\n\
+   /G user:perm  Assegura els drets d'acc<63>s especificats per al usuari.\n\
+                 perm pot ser: R  Lectura\n\
+                               W  Escriptura\n\
+                               C  Modificaci<63> (Escriptura)\n\
+                               F  Control total\n\
+   /R usuari     Revoca els drets d'acc<63>s especificats per al usuari(nom<6F>s v<>lid amb /E).\n\
+   /P user:perm  Canvia els drets d'acc<63>s especificats per al usuari.\n\
+                 perm pot ser: N  Cap\n\
+                               R  Lectura\n\
+                               W  Escriptura\n\
+                               C  Modificaci<63> (Escriptura)\n\
+                               F  Control total\n\
+   /D usuari     Denega els drets d'acc<63>s especificats per al usuari.\n\
+Es possible utilitzar comodins per especificar m<>s d'un fitxer per comanda.\n\
+Podeu especificar m<>s d'un usuari per comanda.\n\n\
+Abreviacions:\n\
+   CI - Container heredat.\n\
+        ACE s'heredar<61> per directoris.\n\
+   OI - Objecte heredat.\n\
+        ACE s'heredar<61> per fitxers.\n\
+   IO - Nom<6F>s heredat.\n\
+        ACE no s'aplicar<61> al directori/fitxer actual.\n"
+
+IDS_ABBR_CI, "(CI)"
+IDS_ABBR_OI, "(OI)"
+IDS_ABBR_IO, "(IO)"
+IDS_ABBR_FULL, "F"
+IDS_ABBR_READ, "R"
+IDS_ABBR_WRITE, "W"
+IDS_ABBR_CHANGE, "C"
+IDS_ABBR_NONE, "N"
+IDS_ALLOW, ""
+IDS_DENY, "(DENEGAT)"
+IDS_SPECIAL_ACCESS, "(acc<63>s especial:)"
+IDS_GENERIC_READ, "GENERIC_READ"
+IDS_GENERIC_WRITE, "GENERIC_WRITE"
+IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
+IDS_GENERIC_ALL, "GENERIC_ALL"
+IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
+IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
+IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
+IDS_FILE_READ_DATA, "FILE_READ_DATA"
+IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
+IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
+IDS_FILE_READ_EA, "FILE_READ_EA"
+IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
+IDS_FILE_EXECUTE, "FILE_EXECUTE"
+IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
+IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
+IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
+IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
+IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
+IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
+IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
+IDS_SYNCHRONIZE, "SYNCHRONIZE"
+IDS_WRITE_OWNER, "WRITE_OWNER"
+IDS_WRITE_DAC, "WRITE_DAC"
+IDS_READ_CONTROL, "READ_CONTROL"
+IDS_DELETE, "DELETE"
+IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
+}

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

@@ -10,7 +10,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 {
 
-IDS_HELP, "Poka<6B> albo modyfikuj list<73> kontroli dost<73>pu (Access Control List) plik<69>w\n\n\
+IDS_HELP, "Poka<6B> lub modyfikuj list<73> kontroli dost<73>pu (Access Control List) plik<69>w\n\n\
 CACLS nazwa pliku [/T] [/E] [/C] [/G u<>ytkownik:dost<73>p [...]] [/R u<>ytkownik [...]]\n\
                [/P u<>ytkownik:dost<73>p [...]] [/D u<>ytkownik [...]]\n\
    filename      Poka<6B> ACL.\n\
@@ -24,7 +24,7 @@ CACLS nazwa pliku [/T] [/E] [/C] [/G u
                               W  Zapisu\n\
                               C  Zmiany (zapis)\n\
                               F  Pe<50>en dost<73>p\n\
-   /R u<>ytkownik         Odwo<77>aj okre<72>lonemu u<>ytkownikowi prawa dost<73>pu (tylko wa<EFBFBD>ny z /E).\n\
+   /R u<>ytkownik         Odwo<77>aj okre<72>lonemu u<>ytkownikowi prawa dost<73>pu (wa<77>ny tylko z /E).\n\
    /P u<>ytkownik:dost<73>p  Zast<73>p okre<72>lonemu u<>ytkownikowi prawa dost<73>pu.\n\
                          Dost<73>p ma by<62> tylko do:\n\
                               N  <20>adnego\n\

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

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

reactos/base/applications/cacls/rsrc.rc

@@ -1,14 +1,8 @@
-
-
 #include <windows.h>
 #include "resource.h"
 
-/* define language neutral resources */
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-/* include localised resources */
 #include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
 #include "lang/de-DE.rc"
 #include "lang/el-GR.rc"
 #include "lang/en-US.rc"
@@ -21,3 +15,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/ru-RU.rc"
 #include "lang/uk-UA.rc"
 #include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"

reactos/base/applications/calc/calc.rbuild

@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="calc" type="win32gui" installbase="system32" installname="calc.exe">
 	<include base="calc">.</include>
 	<define name="__USE_W32API" />
@@ -5,6 +7,8 @@
 	<define name="WINVER">0x0501</define>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
+	<family>applications</family>
+	<family>guiapplications</family>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

reactos/base/applications/calc/lang/ca-ES.rc

@@ -0,0 +1,163 @@
+/*
+ * WineCalc (En.rc)
+ *
+ * Copyright 2003 James Briggs
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "windows.h"
+#include "resource.h"
+#include "winecalc.h"
+
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+   IDS_APPNAME,            "Calculadora"
+
+   IDS_COPYRIGHT1,         "Calculadora 5.0. Sota llicenia LGPL 2"
+   IDS_COPYRIGHT2          "Copyright 2003, James Briggs"
+   IDS_COPYRIGHT3          "San Jose, California, USA"
+   IDS_COPYRIGHT4          "james@ActionMessage.com"
+   IDS_COPYRIGHT5          "http://www.ActionMessage.com/winecalc/"
+
+   IDS_BTN_BACKSPACE,      "Retroc<6F>s"
+   IDS_BTN_CLEAR_ENTRY,    "CE"
+   IDS_BTN_CLEAR_ALL,      "C"
+   IDS_BTN_MEM_CLEAR,      "MC"
+   IDS_BTN_MEM_RECALL,     "MR"
+   IDS_BTN_MEM_STORE,      "MS"
+   IDS_BTN_MEM_PLUS,       "M+"
+   IDS_BTN_MEM_STATUS_M,   "M"
+   IDS_BTN_SQRT,           "sqrt"
+   IDS_BTN_DEGREES,        "Sexagesimal"
+   IDS_BTN_RADIANS,        "Radiant"
+   IDS_BTN_GRADS,          "Graus"
+   IDS_BTN_SHRT_HEX        "Hex"
+   IDS_BTN_SHRT_DEC        "Dec"
+   IDS_BTN_SHRT_OCT        "Oct"
+   IDS_BTN_SHRT_BIN        "Bin"
+   IDS_ERR_INVALID_INPUT,  "Entrada inv<6E>lida per la funci<63>."
+   IDS_ERR_DIVIDE_BY_ZERO, "No puc dividir per zero."
+   IDS_ERR_UNDEFINED,      "El resultat de la funci<63> <20>s indefinit."
+}
+
+MAIN_MENU MENU DISCARDABLE
+{
+   POPUP "&Edita" {
+      MENUITEM "&Copia Ctrl+C",     IDM_COPY
+      MENUITEM "E&nganxa Ctrl+V",    IDM_PASTE
+   }
+   POPUP "&Vista" {
+      MENUITEM "Estandard",         IDM_MODE_STANDARD
+      MENUITEM "Cient<6E>fica",       IDM_MODE_SCIENTIFIC
+      MENUITEM SEPARATOR
+      MENUITEM "Agrupaci<63> de d<>gits",   IDM_DIGIT_GROUPING
+   }
+   POPUP "&Ajuda" {
+      MENUITEM "Temes d'ajuda",      IDM_HELP_TOPICS
+      MENUITEM SEPARATOR
+      MENUITEM "En quant a la Calculadora", IDM_ABOUT
+   }
+}
+
+SCIMS_MENU MENU DISCARDABLE
+{
+   POPUP "&Edita" {
+      MENUITEM "&Copia Ctrl+C",     IDM_COPY
+      MENUITEM "E&ngancxa Ctrl+V",    IDM_PASTE
+   }
+   POPUP "&Vista" {
+      MENUITEM "Estandard",         IDM_MODE_STANDARD
+      MENUITEM "Cient<6E>fica",       IDM_MODE_SCIENTIFIC
+      MENUITEM SEPARATOR
+	  MENUITEM "Hexadecimal\tF5",          ID_CALC_NS_HEX
+	  MENUITEM "Decimal\tF6",      ID_CALC_NS_DEC
+	  MENUITEM "Octal\tF7",        ID_CALC_NS_OCT
+	  MENUITEM "Bin<69>ria\tF8",       ID_CALC_NS_BIN
+      MENUITEM SEPARATOR
+      MENUITEM "Sexagesimal\tF2",      ID_CALC_MS_DEGREES
+      MENUITEM "Radiants\tF3",      ID_CALC_MS_RADIANS
+	  MENUITEM "Graus\tF4",        ID_CALC_MS_GRADS
+      MENUITEM SEPARATOR
+      MENUITEM "Agrupaci<63> de digits",   IDM_DIGIT_GROUPING
+   }
+   POPUP "&Ajuda" {
+      MENUITEM "Temes d'ajuda",      IDM_HELP_TOPICS
+      MENUITEM SEPARATOR
+      MENUITEM "En quant a la Calculadora", IDM_ABOUT
+   }
+}
+
+SCIWS_MENU MENU DISCARDABLE
+{
+   POPUP "&Edita" {
+      MENUITEM "&Copia Ctrl+C",     IDM_COPY
+      MENUITEM "E&nganxa Ctrl+V",    IDM_PASTE
+   }
+   POPUP "&Vista" {
+      MENUITEM "Estandard",         IDM_MODE_STANDARD
+      MENUITEM "Cientifica",       IDM_MODE_SCIENTIFIC
+      MENUITEM SEPARATOR
+	  MENUITEM "Hexadecimal\tF5",          ID_CALC_NS_HEX
+	  MENUITEM "Decimal\tF6",      ID_CALC_NS_DEC
+	  MENUITEM "Octal\tF7",        ID_CALC_NS_OCT
+	  MENUITEM "Bin<69>ria\tF8",       ID_CALC_NS_BIN
+      MENUITEM SEPARATOR
+	  MENUITEM "Qword\tF12",       ID_CALC_WS_QWORD
+	  MENUITEM "Dword\tF2",        ID_CALC_WS_DWORD
+	  MENUITEM "Word\tF3",         ID_CALC_WS_WORD
+	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
+      MENUITEM SEPARATOR
+      MENUITEM "Agrupaci<63> de digits",   IDM_DIGIT_GROUPING
+   }
+   POPUP "&Ajuda" {
+      MENUITEM "Temes d'ajuda",      IDM_HELP_TOPICS
+      MENUITEM SEPARATOR
+      MENUITEM "En quant a la Calculadora", IDM_ABOUT
+   }
+}
+
+MAIN_MENU ACCELERATORS
+BEGIN
+   VK_F1, IDV_HELP,     VIRTKEY
+END
+
+DLG_ABOUT DIALOG 12,0,120,82
+CAPTION "En quant a GNU winecalc"
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+BEGIN
+   DEFPUSHBUTTON "Acceptar", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+WHATS_THIS_MENU MENU DISCARDABLE
+{
+    POPUP "" {
+      MENUITEM "Qu<51> es aix<69>?",     IDM_WHATS_THIS
+   }
+}
+
+DLG_STATS DIALOG 12,0,125,78
+CAPTION "Cuadre Estad<61>stic"
+FONT 9, "Tahoma"
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&C<>RREGA", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&D"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+END
+

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

@@ -30,7 +30,7 @@ STRINGTABLE DISCARDABLE
    IDS_BTN_MEM_PLUS,       "M+"
    IDS_BTN_MEM_STATUS_M,   "M"
    IDS_BTN_SQRT,           "sqrt"
-   IDS_ERR_INVALID_INPUT,  "Niewa<EFBFBD>ne wej<65>cie dla funkcji."
+   IDS_ERR_INVALID_INPUT,  "Niew<EFBFBD>a<EFBFBD>ciwy argument funkcji."
    IDS_ERR_DIVIDE_BY_ZERO, "Nie mo<6D>na dzieli<6C> przez zero."
    IDS_ERR_UNDEFINED,      "Nieokre<72>lony wynik funkcji."
 }
@@ -102,7 +102,7 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Wo&rd\tF3",         ID_CALC_WS_WORD
 	  MENUITEM "&Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
-      MENUITEM "Digit Grouping",   IDM_DIGIT_GROUPING
+      MENUITEM "&Grupowanie cyfr",   IDM_DIGIT_GROUPING
    }
    POPUP "Pomo&c" {
       MENUITEM "&Tematy pomocy",      IDM_HELP_TOPICS

reactos/base/applications/calc/rsrc.rc

@@ -26,6 +26,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDI_CALCICON ICON "calculator.ico"
 
 #include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
 #include "lang/cs-CZ.rc"
 #include "lang/de-DE.rc"
 #include "lang/el-GR.rc"

reactos/base/applications/charmap/charmap.c

@@ -269,7 +269,7 @@ DlgProc(HWND hDlg,
                     TCHAR ch;
                     HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
 
-                    ch = SendMessage(hMap, FM_GETCHAR, 0, 0);
+                    ch = (TCHAR) SendMessage(hMap, FM_GETCHAR, 0, 0);
 
                     if (ch)
                     {

reactos/base/applications/charmap/charmap.rbuild

@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
-<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
 	<include base="charmap">.</include>
-		<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
+	<family>applications</family>
+	<family>guiapplications</family>
 	<library>ntdll</library>
 	<library>gdi32</library>
 	<library>kernel32</library>
@@ -20,4 +21,3 @@
 	<file>charmap.rc</file>
 	<pch>precomp.h</pch>
 </module>
-</rbuild>

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

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

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

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

reactos/base/applications/charmap/rsrc.rc

@@ -8,12 +8,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDI_ICON ICON "res/charmap.ico"
 
 #include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
 #include "lang/en-US.rc"
 #include "lang/de-DE.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
+#include "lang/lt-LT.rc"
 #include "lang/pl-PL.rc"
 #include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"

reactos/base/applications/cmdutils/cmdutils.rbuild

@@ -1,4 +1,9 @@
-<group>
+<?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="find">
 		<xi:include href="find/find.rbuild" />
 	</directory>

reactos/base/applications/cmdutils/dbgprint/dbgprint.c

@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dbgprint.c 24720 2006-11-11 16:07:35Z janderwald $
  *
  * PROJECT:         ReactOS DbgPrint Utility
  * LICENSE:         GPL - See COPYING in the top level directory

reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild

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

reactos/base/applications/cmdutils/find/find.rbuild

@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="find" type="win32cui" installbase="system32" installname="find.exe">
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>

reactos/base/applications/cmdutils/find/lang/bg-BG.rc

@@ -0,0 +1,17 @@
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "FIND: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>..\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"<22><><EFBFBD>\" [ <20><><EFBFBD><EFBFBD>... ]\n\
+    /C  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n\
+    /I  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
+    /N  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 1\n\
+    /V  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>."
+
+IDS_NO_SUCH_FILE, "FIND: %s: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
+
+IDS_CANNOT_OPEN, "FIND: %s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+}

reactos/base/applications/cmdutils/find/lang/ca-ES.rc

@@ -0,0 +1,17 @@
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "FIND: Mostra totes les linies que continguin una determinada cadena de car<61>cters.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"Cadena de car<61>cters\" [ file... ]\n\
+    /C  Conta el numero de linies que contenen la cadena de car<61>cters\n\
+    /I  Ignore case\n\
+    /N  Numero de linies mostrades, comen<65>ant per la primera\n\
+    /V  Mostra les linies que no contenen la cadena de car<61>cters"
+
+IDS_NO_SUCH_FILE, "FIND: %s: No he trobat el fitxer\n"
+
+IDS_CANNOT_OPEN, "FIND: %s: No puc obrir el fitxer\n"
+
+}

reactos/base/applications/cmdutils/find/lang/de-DE.rc

@@ -0,0 +1,17 @@
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "Sucht in einer Datei nach einer Zeichenfolge.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\
+    /C  Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\
+    /I  Ignoriert Gro<72>-/Kleinbuchstaben bei der Suche.\n\
+    /N  Zeigt die Zeilen mit ihren Zeilennummern an.\n\
+    /V  Zeigt alle Zeilen an, die die Zeichenfolge NICHT enhalten."
+
+IDS_NO_SUCH_FILE, "Datei %s nicht gefunden\n"
+
+IDS_CANNOT_OPEN, "Datei %s kann nicht ge<67>ffnet werden.\n"
+
+}

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

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

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

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

reactos/base/applications/cmdutils/find/lang/uk-UA.rc

@@ -0,0 +1,25 @@
+/*
+ * PROJECT:     Find
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/find/lang/uk-UA.rc
+ * PURPOSE:     Ukraianian Language File for find
+ * TRANSLATOR:  Artem Reznikov
+ */
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "FIND: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"<22><><EFBFBD><EFBFBD><EFBFBD>\" [ <20><><EFBFBD><EFBFBD>... ]\n\
+    /C  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n\
+    /I  <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
+    /N  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> 1)\n\
+    /V  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
+
+IDS_NO_SUCH_FILE, "FIND: %s: <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>\n"
+
+IDS_CANNOT_OPEN, "FIND: %s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
+
+}

reactos/base/applications/cmdutils/find/rsrc.rc

@@ -1,5 +1,11 @@
 #include <windows.h>
 #include "resource.h"
 
+#include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
+#include "lang/de-DE.rc"
 #include "lang/en-US.rc"
+#include "lang/it-IT.rc"
+#include "lang/lt-LT.rc"
 #include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"

reactos/base/applications/cmdutils/more/lang/bg-BG.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_USAGE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n\
+  MORE < [<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:][<5B><><EFBFBD>]<5D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>\n\
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> | MORE \n\
+  MORE [<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:][<5B><><EFBFBD>]<5D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>\n\n\
+  [<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:][<5B><><EFBFBD>]<5D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>    <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\t\t     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n\
+  <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ""-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --"" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
+
+  IDS_CONTINUE, " -- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (100%) -- "
+  IDS_FILE_ACCESS, "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> %s."
+}

reactos/base/applications/cmdutils/more/lang/ca-ES.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_USAGE, "Mostra en pantalla el contingut p<>gina per p<>gina.\n\n\
+  MORE < [Unitat:][Ruta]Nom del fitxer\n\
+  Instrucci<63> | MORE \n\
+  MORE [Unitat:][Ruta]Nom del fitxer\n\n\
+  [Unitat:][Ruta]Nom del fitxer    Un fitxer, el contingut del qual ser<65> mostrat.\n\
+  Instrucci<63>\t\t     Una instrucci<63>, el resultat de la qual ser<65> mostrada.\n\n\
+  Al visualitzar ""-- Continua --"" heu de premer qualsevol tecla per visualitzar la seg<65>ent p<>gina.\n"
+
+  IDS_CONTINUE, " -- Continua (100%) -- "
+  IDS_FILE_ACCESS, "No puc accedir al fitxer %s."
+}

reactos/base/applications/cmdutils/more/lang/de-DE.rc

@@ -0,0 +1,16 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_USAGE, "Zeigt Daten seitenweise auf dem Bildschirm an.\n\n\
+  MORE < [Laufwerk:][Pfad]Dateiname\n\
+  Befehl | MORE \n\
+  MORE [Laufwerk:][Pfad]Dateiname\n\n\
+  [Laufwerk:][Pfad]Dateiname Eine Datei, deren Inhalt angezeigt werden soll.\n\
+  Befehl\t\t     Ein Befehl, dessen Ausgabe angezeigt werden soll.\n\n\
+  An der Eingabeaufforderung ""-- Fortsetzung --"" kann eine beliebige\n\
+  Taste gedr<64>ckt werden, um die n<>chste Seite anzuzeigen.\n"
+
+  IDS_CONTINUE, " -- Fortsetzung (100%) -- "
+  IDS_FILE_ACCESS, "Auf die Datei %s kann nicht zugegriffen werden."
+}

reactos/base/applications/cmdutils/more/lang/en-US.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_USAGE, "Displays data page-by-page on the screen.\n\n\
+  MORE < [Drive:][Path]File name\n\
+  Command | MORE \n\
+  MORE [Drive:][Path]File name\n\n\
+  [Drive:][Path]File name    A file, whose content shall be displayed.\n\
+  Command\t\t     A command, whose output shall be displayed.\n\n\
+  At the prompt ""-- Continue --"" you can press any key to show the next page.\n"
+
+  IDS_CONTINUE, " -- Continue (100%) -- "
+  IDS_FILE_ACCESS, "Cannot access the file %s."
+}

reactos/base/applications/cmdutils/more/lang/fr-FR.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_USAGE, "Affiche les donn<6E>es page par page <20> l'<27>cran.\n\n\
+  MORE < [Lecteur:][Chemin]Nom du fichier\n\
+  Commande | MORE \n\
+  MORE [Lecteur:][Chemin]Nom du fichier\n\n\
+  [Lecteur:][Chemin]Nom du fichier    Un fichier, dont le contenu sera affich<63>.\n\
+  Commande\t\t     Une commande, dont la sortie sera affich<63>.\n\n\
+  <20> l'invite ""-- Continuer --"" you pouvez appuyer sur n'importe quelle touche pour afficher la page suivante.\n"
+
+  IDS_CONTINUE, " -- Continuer (100%) -- "
+  IDS_FILE_ACCESS, "Impossible d'acc<63>der au fichier %s."
+}

reactos/base/applications/cmdutils/more/lang/it-IT.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_USAGE, "Visualizza dati una schermata per volta.\n\n\
+  MORE < [Drive:][Path]File\n\
+  Comando | MORE \n\
+  MORE [Drive:][Path]File\n\n\
+  [Drive:][Path]File    Il file da visualizzare.\n\
+  Comando\t\t     Il comando di cui l'output dev'essere visualizzato.\n\n\
+  Alla richiesta ""-- Continua --"" premere un tasto qualsiasi per visualizzare la pagina successiva.\n"
+
+  IDS_CONTINUE, " -- Continua (100%) -- "
+  IDS_FILE_ACCESS, "Impossibile accedere al file %s."
+}

reactos/base/applications/cmdutils/more/lang/lt-LT.rc

@@ -0,0 +1,27 @@
+/*
+ * PROJECT:     ReactOS more command
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/more/lang/lt-LT.rc
+ * PURPOSE:     Lithuanian Language File
+ * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
+ * DATE:        2007-09-23
+ */
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_USAGE, "Atvaizduoja duomenis puslapiais.\n\n\
+  MORE < [Diskas:][Kelias iki bylos]Bylos vardas\n\
+  Komanda | MORE \n\
+  MORE [Diskas:][Kelias iki bylos]Bylos vardas\n\n\
+  [Diskas:][Kelias iki bylos]Bylos vardas    Byla, kurios turinys turi b<>ti\n\
+                                             atvaizduotas.\n\
+  Komanda                                    Komanda, kurios rezultatas turi\n\
+                                             b<>ti atvaizduotas.\n\n\
+  Pasirod<6F>ius raginimui ""-- Toliau --"" spauskite bet kur<75> klavi<76><69>, kad\n\
+  pamatytum<75>te sekant<6E> puslap<61>.\n"
+
+  IDS_CONTINUE, " -- Toliau (100%) -- "
+  IDS_FILE_ACCESS, "Nepavyko atverti bylos %s."
+}

reactos/base/applications/cmdutils/more/lang/uk-UA.rc

@@ -0,0 +1,23 @@
+/*
+ * PROJECT:     ReactOS Console Command More
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        /base/applications/cmdutils/more/lang/uk-UA.rc
+ * PURPOSE:     Ukraianian Language File for ReactOS Console Command More
+ * PROGRAMMERS: Rostislav Zabolotny
+ */
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_USAGE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n\n\
+  MORE < [Drive:][Path]<5D><>'<27>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD>\n\
+  Command | MORE \n\
+  MORE [Drive:][Path]<5D><>'<27>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD>\n\n\
+  <20><>: \n\
+  [Drive:][Path]<5D><>'<27>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD>    <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
+  Command\t\t     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\n\
+  <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ""-- <20><><EFBFBD><EFBFBD> --"" <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
+
+  IDS_CONTINUE, " -- <20><><EFBFBD><EFBFBD> (100%) -- "
+  IDS_FILE_ACCESS, "<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> %s."
+}

reactos/base/applications/cmdutils/more/more.c

@@ -13,11 +13,12 @@
 #include <windows.h>
 #include <malloc.h>
 #include <tchar.h>
+#include <stdio.h>
+#include "resource.h"
 
-
-DWORD len;
-LPTSTR msg = _T("--- continue ---");
-
+static TCHAR szCont[128];
+static DWORD szContLength;
+static HINSTANCE hApp;
 
 /*handle for file and console*/
 HANDLE hStdIn;
@@ -70,7 +71,7 @@ WaitForKey (VOID)
 {
    DWORD dwWritten;
 
-	WriteFile (hStdErr,msg , len, &dwWritten, NULL);
+    WriteFile (hStdErr, szCont , szContLength, &dwWritten, NULL);
 
    ConInKey();
 
@@ -88,7 +89,7 @@ int main (int argc, char **argv)
    DWORD i, last;
    HANDLE hFile = INVALID_HANDLE_VALUE;
    TCHAR szFullPath[MAX_PATH];
-
+    TCHAR szMsg[1024];
    /*reading/writing buffer*/
    TCHAR *buff;
 
@@ -98,14 +99,28 @@ int main (int argc, char **argv)
    /*ReadFile() return value*/
    BOOL bRet;
 
-	len = _tcslen (msg);
+
    hStdIn = GetStdHandle(STD_INPUT_HANDLE);
    hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
    hStdErr = GetStdHandle(STD_ERROR_HANDLE);
+    hApp = GetModuleHandle(NULL);
+
+   buff=malloc(4096);
+   if (!buff)
+   {
+      ConOutPuts(_T("Error: no memory"));
+      return 1;
+   }
 
    if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0)
    {
-		ConOutPuts(_T("Help text still missing!!"));
+      if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR))
+      {
+         CharToOem(buff, buff);
+         ConOutPuts(buff);
+      }
+
+      free(buff);
       return 0;
    }
 
@@ -114,19 +129,30 @@ int main (int argc, char **argv)
 
    GetScreenSize(&maxx,&maxy);
 
-	buff=malloc(4096);
+
 
    FlushConsoleInputBuffer (hKeyboard);
 
    if(argc > 1)
    {
-		GetFullPathName(argv[1], MAX_PATH, szFullPath, NULL);
-		hFile = CreateFile (szFullPath, GENERIC_READ,
-	                        0,NULL,OPEN_ALWAYS,0,0);
-        
+      GetFullPathNameA(argv[1], MAX_PATH, szFullPath, NULL);
+      hFile = CreateFile (szFullPath, 
+                            GENERIC_READ,
+                           0,
+                            NULL,
+                            OPEN_EXISTING,
+                            0,
+                            0);
       if (hFile == INVALID_HANDLE_VALUE)
       {
-			ConOutPuts(_T("The file could not be opened"));
+         if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR))
+         {
+            _stprintf(buff, szMsg, szFullPath);
+            CharToOem(buff, buff);
+            ConOutPuts(buff);
+         }
+
+         free(buff);
          return 0;
       }
    }
@@ -135,6 +161,15 @@ int main (int argc, char **argv)
       hFile = hStdIn;
    }
 
+    if (!LoadString(hApp, IDS_CONTINUE, szCont, sizeof(szCont) / sizeof(TCHAR)))
+    {
+        /* Shouldn't happen, so exit */
+        return 1;
+    }
+    szContLength = _tcslen(szCont);
+
+
+
    do
    {
       bRet = ReadFile(hFile,buff,4096,&dwRead,NULL);

reactos/base/applications/cmdutils/more/more.rbuild

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

reactos/base/applications/cmdutils/more/more.rc

@@ -4,3 +4,5 @@
 #define REACTOS_STR_INTERNAL_NAME	"more\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"more.exe\0"
 #include <reactos/version.rc>
+
+#include "rsrc.rc"

reactos/base/applications/cmdutils/more/resource.h

@@ -0,0 +1,20 @@
+#ifndef RESOURCE_H__ /* resource.h */
+#define RESOURCE_H__
+
+#define IDS_USAGE           100
+#define IDS_CONTINUE        101
+#define IDS_FILE_ACCESS     102
+
+
+
+
+
+
+
+
+
+
+
+
+
+#endif /* EOF of resource.h */

reactos/base/applications/cmdutils/more/rsrc.rc

@@ -0,0 +1,11 @@
+#include <windows.h>
+#include "resource.h"
+
+#include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/it-IT.rc"
+#include "lang/fr-FR.rc"
+#include "lang/lt-LT.rc"
+#include "lang/uk-UA.rc"

reactos/base/applications/control/control.c

@@ -386,46 +386,39 @@ RunControlPanel(LPCTSTR lpName, UINT uIndex)
   return 0;
 }
 
-
-int WINAPI
-_tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
+int
+_tmain(int argc, const TCHAR *argv[])
 {
-  LPTSTR lpCommandLine;
-  LPTSTR lpParam;
+  STARTUPINFO si;
 
-  hInst = hInstance;
-  CTL_DEBUG((_T("My Control Panel\r\n")));
+  si.cb = sizeof(si);
+  GetStartupInfo(&si);
 
-  lpCommandLine = GetCommandLine();
+  hInst = GetModuleHandle(NULL);
 
-  CTL_DEBUG((_T("CommandLine: %s\n"), lpCommandLine));
-
-  lpParam = _tcschr(lpCommandLine, _T(' '));
-  if (lpParam == NULL)
+  if (argc <= 1)
     {
       /* No argument on the command line */
-      return RunControlPanelWindow(nCmdShow);
+      return RunControlPanelWindow(si.wShowWindow);
     }
 
-  lpParam++;
-
-  if (_tcsicmp(lpParam, _T("desktop")) == 0)
+  if (_tcsicmp(argv[1], _T("desktop")) == 0)
     {
       return RunControlPanel(_T("desk.cpl"), 0);
     }
-  else if (_tcsicmp(lpParam, _T("date/time")) == 0)
+  else if (_tcsicmp(argv[1], _T("date/time")) == 0)
     {
       return RunControlPanel(_T("timedate.cpl"), 0);
     }
-  else if (_tcsicmp(lpParam, _T("international")) == 0)
+  else if (_tcsicmp(argv[1], _T("international")) == 0)
     {
       return RunControlPanel(_T("intl.cpl"), 0);
     }
-  else if (_tcsicmp(lpParam, _T("mouse")) == 0)
+  else if (_tcsicmp(argv[1], _T("mouse")) == 0)
     {
       return RunControlPanel(_T("main.cpl"), 0);
     }
-  else if (_tcsicmp(lpParam, _T("keyboard")) == 0)
+  else if (_tcsicmp(argv[1], _T("keyboard")) == 0)
     {
       return RunControlPanel(_T("main.cpl"), 1);
     }

reactos/base/applications/control/control.rbuild

@@ -1,6 +1,7 @@
+<?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>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>

reactos/base/applications/control/lang/ca-ES.rc

@@ -0,0 +1,27 @@
+// Catalan language resource file (Hiper, equip Capdellu<6C>)
+
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDM_MAINMENU MENU DISCARDABLE
+BEGIN
+    POPUP "&Fitxer"
+    BEGIN
+        MENUITEM "&Tancar",                     IDM_CLOSE
+    END
+    POPUP "&Veure"
+    BEGIN
+        MENUITEM "Icones grans",                IDM_LARGEICONS
+        MENUITEM "Icones petites",              IDM_SMALLICONS
+        MENUITEM "Llista",                      IDM_LIST
+        MENUITEM "Detalls",                     IDM_DETAILS
+    END
+    POPUP "Ajuda"
+    BEGIN
+        MENUITEM "En quant a",                  IDM_ABOUT
+    END
+END

reactos/base/applications/control/lang/lt-LT.rc

@@ -0,0 +1,30 @@
+/*
+ * PROJECT:     ReactOS System Control Panel
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/control/lang/lt-LT.rc
+ * PURPOSE:     Lithuanian Language File
+ * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
+ * DATE:        2007-09-23
+ */
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+IDM_MAINMENU MENU DISCARDABLE
+BEGIN
+    POPUP "&Byla"
+    BEGIN
+        MENUITEM "&Baigti",                     IDM_CLOSE
+    END
+    POPUP "&Rodymas"
+    BEGIN
+        MENUITEM "Didel<65>s piktogramos",         IDM_LARGEICONS
+        MENUITEM "Ma<4D>os piktogramos",           IDM_SMALLICONS
+        MENUITEM "S<>ra<72>as",                     IDM_LIST
+        MENUITEM "Detalus s<>ra<72>as",             IDM_DETAILS
+    END
+    POPUP "&Pagalba"
+    BEGIN
+        MENUITEM "&Apie",                       IDM_ABOUT
+    END
+END
+

reactos/base/applications/control/rsrc.rc

@@ -9,6 +9,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* include localised resources */
 #include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
 #include "lang/cs-CZ.rc"
 #include "lang/da-DK.rc"
 #include "lang/de-DE.rc"
@@ -21,6 +22,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/ja-JP.rc"
+#include "lang/lt-LT.rc"
 #include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

reactos/base/applications/games/games.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<group>
+<!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>

reactos/base/applications/games/solitaire/cardlib/cardlib.h

@@ -8,15 +8,14 @@ void CardLib_SetZoomSpeed(int);
 
 #define CS_EI_NONE	0
 #define CS_EI_SUNK	1
+#define CS_EI_CIRC	67
+#define CS_EI_X		66
 
 #define CS_DEFXOFF			12		//x-offset
 #define CS_DEFYOFF			18		//y-offset
 #define CS_NO3D				1		//default 3d counts (recommened)
 #define CS_DEF3D			10		//(best for decks)
 
-//#define CS_EI_CIRC	2
-//#define CS_EI_X		3
-
 #define CS_DRAG_NONE		0
 #define CS_DRAG_TOP			1
 #define CS_DRAG_ALL			2

reactos/base/applications/games/solitaire/cardlib/cardregion.cpp

@@ -365,7 +365,10 @@ void CardRegion::SetEmptyImage(UINT uImage)
 {
     switch(uImage)
     {
-    case CS_EI_NONE: case CS_EI_SUNK:
+    case CS_EI_NONE:
+    case CS_EI_SUNK:
+    case CS_EI_CIRC:
+    case CS_EI_X:
         uEmptyImage = uImage;
         break;
 

reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp

@@ -347,16 +347,22 @@ void CardRegion::Render(HDC hdc)
 
         switch(uEmptyImage)
         {
-        default: case CS_EI_NONE:
+        default:
+        case CS_EI_NONE:
             //this wipes the RECT variable, so watch out!
             //SetRect(&rect, x, y, x+__cardwidth, y+__cardheight);
             //PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd));
             parentWnd.PaintCardRgn(hdc, x, y, __cardwidth, __cardheight, x, y);
             break;
 
-        case CS_EI_SUNK:    //case CS_EI_CIRC: case CS_EI_X:
+        case CS_EI_SUNK:
             DrawCard(hdc, x, y, __hdcPlaceHolder, __cardwidth, __cardheight);
             break;
+
+        case CS_EI_CIRC:
+        case CS_EI_X:
+            CardBlt(hdc, x, y, uEmptyImage);
+            break;
         }
 
     }
@@ -466,6 +472,11 @@ void CardRegion::PrepareDragBitmaps(int numtodrag)
         case CS_EI_SUNK:
             DrawCard(hdcBackGnd, xoff, yoff, __hdcPlaceHolder, __cardwidth, __cardheight);
             break;
+
+        case CS_EI_CIRC:
+        case CS_EI_X:
+            CardBlt(hdc, xoff, yoff, uEmptyImage);
+            break;
         }
     }
 
@@ -574,6 +585,10 @@ void CardRegion::PrepareDragBitmapsThreed(int numtodrag)
             DrawCard(hdcBackGnd, 0, 0, __hdcPlaceHolder, __cardwidth, __cardheight);
             break;
 
+        case CS_EI_CIRC:
+        case CS_EI_X:
+            CardBlt(hdc, 0, 0, uEmptyImage);
+            break;
         }
     }
 

reactos/base/applications/games/solitaire/lang/bg-BG.rc

@@ -1,8 +1,8 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/en.rc
- * PURPOSE:     English Language File for Solitaire
+ * FILE:        base/applications/games/solitaire/lang/bg-BG.rc
+ * PURPOSE:     Bulgarian Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */
 #include "resource.h"
@@ -13,15 +13,16 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "<22><><EFBFBD><EFBFBD><EFBFBD>", -1, 7, 7, 80, 40
     AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD>", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD>", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
 
-    AUTOCHECKBOX    "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP
     AUTOCHECKBOX    "<22><><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP
 
     DEFPUSHBUTTON   "<22><><EFBFBD><EFBFBD><EFBFBD>", IDOK, 35, 97, 50, 14
@@ -29,7 +30,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Select Card Back"
+CAPTION "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -37,11 +38,10 @@ BEGIN
     CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
-    DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
+    DEFPUSHBUTTON "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDOK, 104, 77, 54, 13
+    PUSHBUTTON    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 162, 77, 54, 13
 END
 
-
 /* Strings */
 
 STRINGTABLE

reactos/base/applications/games/solitaire/lang/ca-ES.rc

@@ -0,0 +1,85 @@
+/*
+ * PROJECT:     Solitaire
+ * LICENSE:     Freeware, permission to use under Public Domain
+ * FILE:        base/applications/games/solitaire/ca-CA.rc
+ * PURPOSE:     Catalan Language File for Solitaire
+ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
+ */
+#include "resource.h"
+
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+
+/* Dialogs */
+
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+CAPTION "Options"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX        "Cartes", -1, 7, 7, 65, 40
+    AUTORADIOBUTTON "Treu-ne &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Treu-ne &Tres", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
+
+    AUTOCHECKBOX    "&Mostra el temps", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "&Barra d'estat", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+
+    DEFPUSHBUTTON   "Acceptar", IDOK, 35, 97, 50, 14
+    PUSHBUTTON      "Cancel·lar", IDCANCEL, 101, 97, 50, 14
+END
+
+
+IDD_CARDBACK DIALOGEX 6, 6, 221, 96
+CAPTION "Seleccioneu l'anvers"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+BEGIN
+    CONTROL       "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
+    DEFPUSHBUTTON "Acceptar", IDOK, 104, 77, 54, 13
+    PUSHBUTTON    "Cancel·lar", IDCANCEL, 162, 77, 54, 13
+END
+
+
+/* Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "Solitari"
+    IDS_SOL_ABOUT   "Solitari per J Brown\n\nCardLib versio 1.0."
+    IDS_SOL_QUIT    "Voleu sortir del joc actual?"
+    IDS_SOL_WIN     "Felicitats, heu guanyat!!"
+END
+
+
+/* Menus */
+
+IDR_MENU1 MENU DISCARDABLE
+BEGIN
+    POPUP "&Joc"
+    BEGIN
+        MENUITEM "R&eparteix\tF2",                   IDM_GAME_NEW
+        MENUITEM SEPARATOR
+        MENUITEM "&Barallar...",                    IDM_GAME_DECK
+        MENUITEM "&Opcions...",                 IDM_GAME_OPTIONS
+        MENUITEM SEPARATOR
+        MENUITEM "&Sortida",                       IDM_GAME_EXIT
+    END
+    POPUP "&Ajuda"
+    BEGIN
+        MENUITEM "&Contingut\tF1",               IDM_HELP_CONTENTS
+        MENUITEM "E&n quant a",                      IDM_HELP_ABOUT
+    END
+END
+
+
+
+/* Accelerator */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
+BEGIN
+    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
+    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
+END

reactos/base/applications/games/solitaire/lang/de-DE.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/de.rc
+ * FILE:        base/applications/games/solitaire/lang/de-DE.rc
  * PURPOSE:     German Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */

reactos/base/applications/games/solitaire/lang/en-US.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/en.rc
+ * FILE:        base/applications/games/solitaire/lang/en-US.rc
  * PURPOSE:     English Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */

reactos/base/applications/games/solitaire/lang/es-ES.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/en.rc
+ * FILE:        base/applications/games/solitaire/lang/es-ES.rc
  * PURPOSE:     Spanish Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */

reactos/base/applications/games/solitaire/lang/fr-FR.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/fr.rc
+ * FILE:        base/applications/games/solitaire/lang/fr-FR.rc
  * PURPOSE:     French Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */
@@ -29,7 +29,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Select Card Back"
+CAPTION "S<EFBFBD>lectionnez le tarot des cartes"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -38,7 +38,7 @@ BEGIN
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
     DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
+    PUSHBUTTON    "Annuler", IDCANCEL, 162, 77, 54, 13
 END
 
 

reactos/base/applications/games/solitaire/lang/it-IT.rc

@@ -15,7 +15,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-CAPTION "Options"
+CAPTION "Opzioni"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Carte", -1, 7, 7, 65, 40
@@ -30,7 +30,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Select Card Back"
+CAPTION "Scegli il retro delle carte"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -39,7 +39,7 @@ BEGIN
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
     DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
+    PUSHBUTTON    "Annulla", IDCANCEL, 162, 77, 54, 13
 END
 
 
@@ -50,7 +50,7 @@ BEGIN
     IDS_SOL_NAME    "Solitario"
     IDS_SOL_ABOUT   "Solitario by J Brown\n\nCardLib versione 1.0."
     IDS_SOL_QUIT    "Chiudere la partita in corso?"
-    IDS_SOL_WIN     "Congratulations, you win!!"
+    IDS_SOL_WIN     "Congratulazioni, hai vinto!!"
 END
 
 

reactos/base/applications/games/solitaire/lang/lt-LT.rc

@@ -0,0 +1,86 @@
+/*
+ * PROJECT:     Solitaire
+ * LICENSE:     Freeware, permission to use under Public Domain
+ * FILE:        base/applications/games/solitaire/lang/lt-LT.rc
+ * PURPOSE:     Lithuanian Language File for Solitaire
+ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
+ * TRANSLATORS: Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
+ */
+#include "resource.h"
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+
+/* Dialogs */
+
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+CAPTION "Nuostatos"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX        "Kortos", -1, 7, 7, 75, 40
+    AUTORADIOBUTTON "Dalinti po &vien<65>", IDC_OPT_DRAWONE, 14, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Dalinti po &tris", IDC_OPT_DRAWTHREE, 14, 32, 60, 10
+
+    AUTOCHECKBOX    "&Rodyti laik<69>", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "&B<>senos juosta", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+
+    DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
+    PUSHBUTTON      "At<41>aukti", IDCANCEL, 101, 97, 50, 14
+END
+
+
+IDD_CARDBACK DIALOGEX 6, 6, 221, 96
+CAPTION "Kort<72> vir<69>elio pasirinkimas"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+BEGIN
+    CONTROL       "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
+    DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
+    PUSHBUTTON    "At<41>aukti", IDCANCEL, 162, 77, 54, 13
+END
+
+
+/* Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_ABOUT   "Solitaire\n\nSukurta J Brown\n\nCardLib version 1.0."
+    IDS_SOL_QUIT    "Baigti <20>aidim<69>?"
+    IDS_SOL_WIN     "Sveikiname, j<>s laim<69>jote!!"
+END
+
+
+/* Menus */
+
+IDR_MENU1 MENU DISCARDABLE
+BEGIN
+    POPUP "&<26>aidimas"
+    BEGIN
+        MENUITEM "&Dalinti\tF2",                   IDM_GAME_NEW
+        MENUITEM SEPARATOR
+        MENUITEM "&Malka...",                    IDM_GAME_DECK
+        MENUITEM "&Nuostatos...",                 IDM_GAME_OPTIONS
+        MENUITEM SEPARATOR
+        MENUITEM "&Baigti",                       IDM_GAME_EXIT
+    END
+    POPUP "&Pagalba"
+    BEGIN
+        MENUITEM "&Turinys\tF1",               IDM_HELP_CONTENTS
+        MENUITEM "&Apie",                      IDM_HELP_ABOUT
+    END
+END
+
+
+
+/* Accelerator */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
+BEGIN
+    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
+    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
+END

reactos/base/applications/games/solitaire/lang/pl-PL.rc

@@ -28,7 +28,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Select Card Back"
+CAPTION "Wybieranie koszulki karty"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -37,7 +37,7 @@ BEGIN
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
     DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
+    PUSHBUTTON    "Anuluj", IDCANCEL, 162, 77, 54, 13
 END
 
 
@@ -46,9 +46,9 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME    "Pasjans"
-    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT   "Solitaire by J. Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Zako<6B>czy<7A> aktualn<6C> gr<67>?"
-    IDS_SOL_WIN     "Congratulations, you win!!"
+    IDS_SOL_WIN     "Gratulacje, wygra<72>e<EFBFBD>!"
 END
 
 

reactos/base/applications/games/solitaire/lang/sk-SK.rc

@@ -31,7 +31,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Select Card Back"
+CAPTION "V<EFBFBD>ber rubu kariet"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -40,7 +40,7 @@ BEGIN
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
     DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
+    PUSHBUTTON    "Zru<EFBFBD>i<EFBFBD>", IDCANCEL, 162, 77, 54, 13
 END
 
 

reactos/base/applications/games/solitaire/lang/uk-UA.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/uk.rc
+ * FILE:        base/applications/games/solitaire/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for Solitaire
  * TRANSLATOR:  Artem Reznikov
  */

reactos/base/applications/games/solitaire/rsrc.rc

@@ -6,6 +6,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 
 #include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
 #include "lang/de-DE.rc"
 #include "lang/el-GR.rc"
 #include "lang/en-US.rc"
@@ -13,6 +14,7 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
+#include "lang/lt-LT.rc"
 #include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"

reactos/base/applications/games/solitaire/solcreate.cpp

@@ -6,10 +6,6 @@
 
 #include "solitaire.h"
 
-const int yBorder = 20;
-const int xBorder = 20;
-const int yRowStacks = yBorder + 128;
-
 CardRegion *pDeck;
 CardRegion *pPile;
 CardRegion *pSuitStack[4];
@@ -19,6 +15,7 @@ extern CardStack activepile;
 
 HBITMAP hbmBitmap;
 HDC     hdcBitmap;
+int     yRowStackCardOffset;
 
 void CreateSol()
 {
@@ -29,9 +26,11 @@ void CreateSol()
 
     activepile.Clear();
 
+    // Compute the value for yRowStackCardOffset based on the height of the card, so the card number isn't hidden on larger cards
+    yRowStackCardOffset = (int)(__cardheight / 6.7);
 
-    pDeck = SolWnd.CreateRegion(DECK_ID, true, xBorder, yBorder, 2, 1);
-    pDeck->SetEmptyImage(CS_EI_SUNK);
+    pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDER, 2, 1);
+    pDeck->SetEmptyImage(CS_EI_CIRC);
     pDeck->SetThreedCount(6);
     pDeck->SetDragRule(CS_DRAG_NONE, 0);
     pDeck->SetDropRule(CS_DROP_NONE, 0);
@@ -39,7 +38,7 @@ void CreateSol()
     pDeck->SetDblClickProc(DeckClickProc);
     pDeck->SetFaceDirection(CS_FACE_DOWN, 0);
 
-    pPile = SolWnd.CreateRegion(PILE_ID, true, 110, yBorder, CS_DEFXOFF, 1);
+    pPile = SolWnd.CreateRegion(PILE_ID, true, X_BORDER + __cardwidth + X_PILE_BORDER, Y_BORDER, CS_DEFXOFF, 1);
     pPile->SetEmptyImage(CS_EI_NONE);
     pPile->SetDragRule(CS_DRAG_TOP, 0);
     pPile->SetDropRule(CS_DROP_NONE, 0);
@@ -51,10 +50,9 @@ void CreateSol()
     //
     for(i = 0; i < 4; i++)
     {
-        pSuitStack[i] = SolWnd.CreateRegion(SUIT_ID+i, true, 0, yBorder, 0, 0);
+        pSuitStack[i] = SolWnd.CreateRegion(SUIT_ID+i, true, 0, Y_BORDER, 0, 0);
         pSuitStack[i]->SetEmptyImage(CS_EI_SUNK);
-        //pSuitStack[i]->SetPlacement(CS_XJUST_RIGHT, 0, -i * (__cardwidth + 4) - xBorder, 0);
-        pSuitStack[i]->SetPlacement(CS_XJUST_CENTER, 0, i * (__cardwidth + 10) , 0);
+        pSuitStack[i]->SetPlacement(CS_XJUST_CENTER, 0, i * (__cardwidth + X_SUITSTACK_BORDER) , 0);
 
         pSuitStack[i]->SetDropRule(CS_DROP_CALLBACK, SuitStackDropProc);
         pSuitStack[i]->SetDragRule(CS_DRAG_TOP);
@@ -67,12 +65,12 @@ void CreateSol()
     //
     for(i = 0; i < NUM_ROW_STACKS; i++)
     {
-        pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, yRowStacks, 0, 14);
+        pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDER + __cardheight + Y_ROWSTACK_BORDER, 0, yRowStackCardOffset);
         pRowStack[i]->SetEmptyImage(CS_EI_SUNK);
         pRowStack[i]->SetFaceDirection(CS_FACE_DOWNUP, i);
 
         pRowStack[i]->SetPlacement(CS_XJUST_CENTER, 0,
-            (i - NUM_ROW_STACKS/2) * (__cardwidth + 10),     0);
+            (i - NUM_ROW_STACKS/2) * (__cardwidth + X_ROWSTACK_BORDER),     0);
 
         pRowStack[i]->SetEmptyImage(CS_EI_NONE);
 

reactos/base/applications/games/solitaire/solgame.cpp

@@ -51,6 +51,10 @@ void NewGame(void)
     pDeck->SetCardStack(deck);
     pDeck->Update();
 
+    // For the 1-card-mode, all cards need to be completely overlapped
+    if(!(dwOptions & OPTION_THREE_CARDS))
+        pPile->SetOffsets(0, 0);
+
     SolWnd.Redraw();
 
     fGameStarted = false;
@@ -331,6 +335,7 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked)
     fGameStarted = true;
 
     //reset the face-up pile to represent 3 cards
+    if(dwOptions & OPTION_THREE_CARDS)
         pPile->SetOffsets(CS_DEFXOFF, 1);
 
     if(cardstack.NumCards() == 0)
@@ -350,7 +355,9 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked)
         temp = cardstack.Pop(numcards);
         temp.Reverse();
 
+        if(dwOptions & OPTION_THREE_CARDS)
             pile.Clear();
+
         pile.Push(temp);
 
         //remove the top 3 from deck

reactos/base/applications/games/solitaire/solitaire.cpp

@@ -169,8 +169,8 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm
                 ,//|WS_CLIPCHILDREN,      // window style
                 CW_USEDEFAULT,            // initial x position
                 CW_USEDEFAULT,            // initial y position
-                600,                      // initial x size
-                450,                      // initial y size
+                0,                        // The real size will be computed in WndProc through WM_GETMINMAXINFO
+                0,                        // The real size will be computed in WndProc through WM_GETMINMAXINFO
                 NULL,                     // parent window handle
                 NULL,                     // use window class menu
                 hInst,                    // program instance handle
@@ -255,11 +255,17 @@ VOID ShowGameOptionsDlg(HWND hwnd)
 
             if (dwOptions & OPTION_SHOW_STATUS)
             {
+                RECT rc;
+
                 ShowWindow(hwndStatus, SW_SHOW);
                 GetWindowRect(hwndStatus, &rcStatus);
                 nStatusHeight = rcStatus.bottom - rcStatus.top;
                 MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE);
                 MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE);
+
+                // Force the window to process WM_GETMINMAXINFO again
+                GetWindowRect(hwndMain, &rc);
+                SetWindowPos(hwndMain, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER);
             }
             else
             {
@@ -317,14 +323,16 @@ CardImageWndProc(HWND hwnd,
                   rc.right,
                   rc.bottom);
 
-        BitBlt(hdc,
+        StretchBlt(hdc,
                    2,
                    2,
-               __cardwidth,
-               __cardheight,
+                   CARDBACK_OPTIONS_WIDTH,
+                   CARDBACK_OPTIONS_HEIGHT,
                    __hdcCardBitmaps,
                    pCardBack->hdcNum * __cardwidth,
                    0,
+                   __cardwidth,
+                   __cardheight,
                    SRCCOPY);
 
         SelectObject(hdc, hOldPen);
@@ -443,17 +451,15 @@ VOID ShowDeckOptionsDlg(HWND hwnd)
 //-----------------------------------------------------------------------------
 LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
-    static int nWidth, nHeight;
-    int parts[] = { 100, -1 };
-    int ret;
-    RECT rc;
-    int nStatusHeight = 0;
-
-    MINMAXINFO *mmi;
+    static int nWidth, nHeight, nStatusHeight;
 
     switch(iMsg)
     {
         case WM_CREATE:
+        {
+            int parts[] = { 100, -1 };
+            RECT rcStatus;
+
             hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0);
 
             //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0);
@@ -465,11 +471,18 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 
             CreateSol();
 
+            // The status bar height is fixed and needed later in WM_SIZE and WM_GETMINMAXINFO
+            // Force the window to process WM_GETMINMAXINFO again
+            GetWindowRect(hwndStatus, &rcStatus);
+            nStatusHeight = rcStatus.bottom - rcStatus.top;
+            SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER);
+
             NewGame();
 
             dwAppStartTime = GetTickCount();
 
             return 0;
+        }
 
         case WM_DESTROY:
             PostQuitMessage(0);
@@ -481,8 +494,6 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 
             if (dwOptions & OPTION_SHOW_STATUS)
             {
-            GetWindowRect(hwndStatus, &rc);
-            nStatusHeight = rc.bottom - rc.top;
                 MoveWindow(SolWnd, 0, 0, nWidth, nHeight - nStatusHeight, TRUE);
                 MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nHeight, TRUE);
             }
@@ -495,10 +506,22 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
             return 0;
 
         case WM_GETMINMAXINFO:
+        {
+            MINMAXINFO *mmi;
+
             mmi = (MINMAXINFO *)lParam;
-        mmi->ptMinTrackSize.x = 600;
-        mmi->ptMinTrackSize.y = 400;
+            mmi->ptMinTrackSize.x = X_BORDER + NUM_ROW_STACKS * (__cardwidth + X_ROWSTACK_BORDER) + X_BORDER;
+            mmi->ptMinTrackSize.y = GetSystemMetrics(SM_CYCAPTION) +
+                                    GetSystemMetrics(SM_CYMENU) +
+                                    Y_BORDER +
+                                    __cardheight +
+                                    Y_ROWSTACK_BORDER +
+                                    6 * yRowStackCardOffset +
+                                    __cardheight +
+                                    Y_BORDER +
+                                    (dwOptions & OPTION_SHOW_STATUS ? nStatusHeight : 0);
             return 0;
+        }
 
         case WM_COMMAND:
             switch(LOWORD(wParam))
@@ -539,6 +562,8 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
             }
             else
             {
+                int ret;
+
                 ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION);
                 if (ret == IDOK)
                 {

reactos/base/applications/games/solitaire/solitaire.h

@@ -11,6 +11,8 @@ extern bool fGameStarted;
 #define CARDBACK_END             IDC_CARDBACK4
 #define NUM_CARDBACKS            (CARDBACK_END - CARDBACK_START + 1)
 #define CARDBACK_RES_START       53
+#define CARDBACK_OPTIONS_WIDTH   72
+#define CARDBACK_OPTIONS_HEIGHT  96
 
 extern DWORD dwOptions;
 
@@ -23,6 +25,15 @@ void NewGame(void);
 #define SUIT_ID            4
 #define ROW_ID             10
 
+// Various metrics used for placing the objects and computing the minimum window size
+#define X_BORDER                 20
+#define X_PILE_BORDER            18
+#define X_ROWSTACK_BORDER        10
+#define X_SUITSTACK_BORDER       10
+#define Y_BORDER                 20
+#define Y_ROWSTACK_BORDER        32
+extern int yRowStackCardOffset;
+
 extern CardRegion *pDeck;
 extern CardRegion *pPile;
 extern CardRegion *pSuitStack[];

reactos/base/applications/games/solitaire/solitaire.rbuild

@@ -1,13 +1,15 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="yes" stdlib="host">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="true">
 	<include base="sol">.</include>
 	<include base="sol">cardlib</include>
 	<linkerflag>-lstdc++</linkerflag>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__REACTOS__" />
+	<family>applications</family>
+	<family>guiapplications</family>
+	<family>games</family>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

reactos/base/applications/games/winemine/lang/bg-BG.rc

@@ -12,7 +12,7 @@ MENU_WINEMINE MENU DISCARDABLE
     POPUP "&<26><><EFBFBD><EFBFBD>" {
         MENUITEM "&<26><><EFBFBD><EFBFBD>",           IDM_NEW
         MENUITEM SEPARATOR
-        MENUITEM "&Mark Question", IDM_MARKQ
+        MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (?)", IDM_MARKQ
         MENUITEM SEPARATOR
         MENUITEM "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      IDM_BEGINNER
         MENUITEM "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      IDM_ADVANCED
@@ -28,9 +28,10 @@ MENU_WINEMINE MENU DISCARDABLE
 }
 
 DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
 CAPTION "<22><><EFBFBD>- <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 {
     GROUPBOX        "<22><><EFBFBD>- <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDNONE,  10,  10, 140,  45
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      IDNONE,  20,  20,  40,   8
@@ -46,9 +47,10 @@ FONT 8, "MS Shell Dlg"
 }
 
 DLG_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 {
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>", IDIGNORE,  10,  10, 150,  10
     EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
@@ -56,9 +58,10 @@ FONT 8, "MS Shell Dlg"
 }
 
 DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 {
     LTEXT           "<22><><EFBFBD><EFBFBD>",   IDNONE,   5,   5,  30,  10
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDNONE,   5,  35,  30,  10
@@ -71,13 +74,14 @@ FONT 8, "MS Shell Dlg"
 }
 
 DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
 CAPTION "<22><>"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
     LTEXT                 "under the Wine license", IDNONE,  35,  35, 100,  10
-    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
+    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "<22><><EFBFBD><EFBFBD><EFBFBD>", IDOK,      50,  60,  55,  15
 }

reactos/base/applications/games/winemine/lang/ca-ES.rc

@@ -0,0 +1,83 @@
+#include "resource.h"
+
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+STRINGTABLE {
+     IDS_APPNAME, "Cercamines"
+
+}
+
+MENU_WINEMINE MENU DISCARDABLE
+{
+    POPUP "&Opcions" {
+        MENUITEM "&Nou",           IDM_NEW
+        MENUITEM SEPARATOR
+        MENUITEM "In&terrogant (?)", IDM_MARKQ
+        MENUITEM SEPARATOR
+        MENUITEM "&Principiant",      IDM_BEGINNER
+        MENUITEM "&Avan<61>at",      IDM_ADVANCED
+        MENUITEM "&Expert",        IDM_EXPERT
+        MENUITEM "Pe&rsonalitzat",        IDM_CUSTOM
+        MENUITEM SEPARATOR
+        MENUITEM "&Sortida",          IDM_EXIT
+    }
+    POPUP "&Info" {
+        MENUITEM "&Millors Temps",    IDM_TIMES
+        MENUITEM "En q&uant a",         IDM_ABOUT
+    }
+}
+
+DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+CAPTION "Millors temps"
+FONT 8, "MS Shell Dlg"
+{
+    GROUPBOX        "Millors Temps", IDNONE,  10,  10, 140,  45
+    LTEXT           "Principiant",      IDNONE,  20,  20,  40,   8
+    LTEXT           "Avan<61>at",      IDNONE,  20,  30,  40,   8
+    LTEXT           "Expert",        IDNONE,  20,  40,  40,   8
+    LTEXT           "999",          IDC_TIME1,  70,  20,  15,   8
+    LTEXT           "999",          IDC_TIME2,  70,  30,  15,   8
+    LTEXT           "999",          IDC_TIME3,  70,  40,  15,   8
+    LTEXT           "",             IDC_NAME1,  90,  20,  55,   8
+    LTEXT           "",             IDC_NAME2,  90,  30,  55,   8
+    LTEXT           "",             IDC_NAME3,  90,  40,  55,   8
+    DEFPUSHBUTTON   "Acceptar",                IDOK,  55,  60,  50,  15
+}
+
+DLG_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+CAPTION "Felicitats!"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT           "Si us plau, entreu el vostre nom", IDIGNORE,  10,  10, 150,  10
+    EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
+    DEFPUSHBUTTON   "Acceptar",                         IDOK,  60,  40,  40,  15
+}
+
+DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+CAPTION "Joc Personalitzat"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT           "Files",   IDNONE,   5,   5,  30,  10
+    LTEXT           "Columnes",   IDNONE,   5,  35,  30,  10
+    LTEXT           "Mines",  IDNONE,   5,  65,  30,  10
+    EDITTEXT              IDC_EDITROWS,   5,  15,  20,  12, ES_NUMBER
+    EDITTEXT              IDC_EDITCOLS,   5,  45,  20,  12, ES_NUMBER
+    EDITTEXT             IDC_EDITMINES,   5,  75,  20,  12, ES_NUMBER
+    DEFPUSHBUTTON   "Acceptar",     IDOK,      40,  30,  50,  15
+    PUSHBUTTON      "Cancel<65>lar", IDCANCEL,  40,  50,  50,  15
+}
+
+DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+CAPTION "En quant a"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT                               "Cercamines", IDNONE,  10,  10,  35,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
+    LTEXT                 "sota llic<69>ncia Wine", IDNONE,  35,  35, 100,  10
+    ICON                              IDI_WINEMINE, IDNONE,  10,  25,  20,  20
+    DEFPUSHBUTTON                             "Acceptar", IDOK,      50,  60,  55,  15
+}

reactos/base/applications/games/winemine/lang/lt-LT.rc

@@ -0,0 +1,85 @@
+/* Translation by Vytis "CMan" Gird<72>ijauskas (cman@cman.us) */
+
+#include "resource.h"
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE {
+     IDS_APPNAME, "WineMine"
+
+}
+
+MENU_WINEMINE MENU DISCARDABLE
+{
+    POPUP "&<26>aidimas" {
+        MENUITEM "&Naujas <20>aidimas",           IDM_NEW
+        MENUITEM SEPARATOR
+        MENUITEM "<22>ym<79>ti &sp<73>jamus (?)", IDM_MARKQ
+        MENUITEM SEPARATOR
+        MENUITEM "&Pradedantis",      IDM_BEGINNER
+        MENUITEM "Pa&<26>eng<6E>s",      IDM_ADVANCED
+        MENUITEM "&Ekspertas",        IDM_EXPERT
+        MENUITEM "Pasi&rinktas",        IDM_CUSTOM
+        MENUITEM SEPARATOR
+        MENUITEM "&Baigti",          IDM_EXIT
+    }
+    POPUP "&Informacija" {
+        MENUITEM "&Grei<65>iausi laikai",    IDM_TIMES
+        MENUITEM "&Apie",         IDM_ABOUT
+    }
+}
+
+DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+CAPTION "Grei<65>iausi laikai"
+FONT 8, "MS Shell Dlg"
+{
+    GROUPBOX        "Grei<65>iausi laikai", IDNONE,  10,  10, 140,  45
+    LTEXT           "Pradedantis",      IDNONE,  20,  20,  40,   8
+    LTEXT           "Pa<50>eng<6E>s",      IDNONE,  20,  30,  40,   8
+    LTEXT           "Ekspertas",        IDNONE,  20,  40,  40,   8
+    LTEXT           "999",          IDC_TIME1,  70,  20,  15,   8
+    LTEXT           "999",          IDC_TIME2,  70,  30,  15,   8
+    LTEXT           "999",          IDC_TIME3,  70,  40,  15,   8
+    LTEXT           "",             IDC_NAME1,  90,  20,  55,   8
+    LTEXT           "",             IDC_NAME2,  90,  30,  55,   8
+    LTEXT           "",             IDC_NAME3,  90,  40,  55,   8
+    DEFPUSHBUTTON   "OK",                IDOK,  55,  60,  50,  15
+}
+
+DLG_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+CAPTION "Sveikiname!"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT           "Pra<72>ome <20>ra<72>yti savo vard<72>", IDIGNORE,  10,  10, 150,  10
+    EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
+    DEFPUSHBUTTON   "OK",                         IDOK,  60,  40,  40,  15
+}
+
+DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+CAPTION "Pasirinktas <20>aidimas"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT           "Eilut<75>s",   IDNONE,   5,   5,  30,  10
+    LTEXT           "Stulpeliai",   IDNONE,   5,  35,  30,  10
+    LTEXT           "Minos",  IDNONE,   5,  65,  30,  10
+    EDITTEXT              IDC_EDITROWS,   5,  15,  20,  12, ES_NUMBER
+    EDITTEXT              IDC_EDITCOLS,   5,  45,  20,  12, ES_NUMBER
+    EDITTEXT             IDC_EDITMINES,   5,  75,  20,  12, ES_NUMBER
+    DEFPUSHBUTTON   "OK",     IDOK,      40,  30,  50,  15
+    PUSHBUTTON      "At<41>aukti", IDCANCEL,  40,  50,  50,  15
+}
+
+DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+CAPTION "Apie"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
+    LTEXT                 "under the Wine license", IDNONE,  35,  35, 100,  10
+    ICON                              IDI_WINEMINE, IDNONE,  10,  25,  20,  20
+    DEFPUSHBUTTON                             "OK", IDOK,      50,  60,  55,  15
+}

reactos/base/applications/games/winemine/lang/pl-PL.rc

@@ -41,7 +41,7 @@ FONT 8, "MS Shell Dlg"
 {
     GROUPBOX        "Najlepsze czasy", IDNONE,  10,  10, 140,  45
     LTEXT           "Pocz<63>tkuj<75>cy",      IDNONE,  20,  20,  40,   8
-    LTEXT           "zaawansowany",      IDNONE,  20,  30,  40,   8
+    LTEXT           "Zaawansowany",      IDNONE,  20,  30,  40,   8
     LTEXT           "Ekspert",        IDNONE,  20,  40,  40,   8
     LTEXT           "999",          IDC_TIME1,  70,  20,  15,   8
     LTEXT           "999",          IDC_TIME2,  70,  30,  15,   8
@@ -59,7 +59,7 @@ FONT 8, "MS Shell Dlg"
 {
     LTEXT           "Wpisz swoje imi<6D>", IDNONE,  10,  10, 150,  10
     EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
-    DEFPUSHBUTTON   "Ok",                         IDOK,  60,  40,  40,  15
+    DEFPUSHBUTTON   "OK",                         IDOK,  60,  40,  40,  15
 }
 
 DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
@@ -73,8 +73,8 @@ FONT 8, "MS Shell Dlg"
     EDITTEXT              IDC_EDITROWS,   5,  15,  20,  12, ES_NUMBER
     EDITTEXT              IDC_EDITCOLS,   5,  45,  20,  12, ES_NUMBER
     EDITTEXT             IDC_EDITMINES,   5,  75,  20,  12, ES_NUMBER
-    DEFPUSHBUTTON   "Ok",     IDOK,      40,  30,  50,  15
-    PUSHBUTTON      "Wycofaj", IDCANCEL,  40,  50,  50,  15
+    DEFPUSHBUTTON   "OK",     IDOK,      40,  30,  50,  15
+    PUSHBUTTON      "Anuluj", IDCANCEL,  40,  50,  50,  15
 }
 
 DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
@@ -86,5 +86,5 @@ FONT 8, "MS Shell Dlg"
     LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "Na licencji Wine", IDNONE,  35,  35, 100,  10
     ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
-    DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55,  15
+    DEFPUSHBUTTON                             "OK", IDOK,      50,  60,  55,  15
 }

reactos/base/applications/games/winemine/rsrc.rc

@@ -12,6 +12,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* include localised resources */
 #include "lang/bg-BG.rc"
+#include "lang/ca-ES.rc"
 #include "lang/de-DE.rc"
 #include "lang/el-GR.rc"
 #include "lang/en-US.rc"
@@ -19,6 +20,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
+#include "lang/lt-LT.rc"
 #include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

reactos/base/applications/games/winemine/winemine.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="winemine" type="win32gui" installbase="system32" installname="winemine.exe">
 	<include base="winemine">.</include>
 	<define name="__USE_W32API" />

reactos/base/applications/hh/hh.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hh" type="win32gui" installbase="system32" installname="hh.exe" unicode="no">
 	<include base="hh">.</include>
 	<define name="__USE_W32API" />
@@ -11,4 +11,3 @@
 	<file>main.c</file>
 	<file>hh.rc</file>
 </module>
-</rbuild>

reactos/base/applications/hostname/hostname.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe" allowwarnings="true">
 	<define name="__USE_W32API" />
 	<library>kernel32</library>

reactos/base/applications/logoff/lang/bg-BG.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n\
+  /v\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /?\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n"
+
+IDS_LOGOFF_REMOTE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+IDS_LOGOFF_LOCAL, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+
+IDS_ILLEGAL_PARAM, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+}
+/* EOF */

reactos/base/applications/logoff/lang/de-DE.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "Beendet eine Sitzung.\n\n\
+  /v\t\tZeigt Informationen zu den Aktionen an, die gerade ausgef<65>hrt werden.\n\
+  /?\t\tZeigt diese Informationen an.\n\n"
+
+IDS_LOGOFF_REMOTE, "Beendet eine Sitzung auf einem Server."
+IDS_LOGOFF_LOCAL, "Beendet eine Sitzung auf dem aktuellen Server."
+
+IDS_ILLEGAL_PARAM, "Ung<6E>ltige(r) Parameter\n"
+}
+/* EOF */

reactos/base/applications/logoff/lang/fr-FR.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "Termine une session.\n\n\
+  /v\t\tAffiche des informations sur les actions r<>alis<69>es.\n\
+  /?\t\tAffiche ces informations.\n\n"
+
+IDS_LOGOFF_REMOTE, "Termine une session sur une machine distante."
+IDS_LOGOFF_LOCAL, "Termine la session courante sur cette machine."
+
+IDS_ILLEGAL_PARAM, "Param<61>tre(s) invalide(s)\n"
+}
+/* EOF */

reactos/base/applications/logoff/lang/it-IT.rc

@@ -0,0 +1,15 @@
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "Termina una sessione.\n\n\
+  /v\t\tVisualizza le informazioni sulle azioni effettuate.\n\
+  /?\t\tVisualizza questa guida.\n\n"
+
+IDS_LOGOFF_REMOTE, "Sto terminando una sessione su una macchina remota."
+IDS_LOGOFF_LOCAL, "Sto terminando la sessione corrente su questa macchina."
+
+IDS_ILLEGAL_PARAM, "Parametri non validi\n"
+}
+/* EOF */

reactos/base/applications/logoff/lang/lt-LT.rc

@@ -0,0 +1,17 @@
+/* Translation by Vytis "CMan" Gird<72>ijauskas (cman@cman.us) */
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "U<>baigia seans<6E>.\n\n\
+  /v\t\tParodo informacij<69> apie atliktus veiksmus.\n\
+  /?\t\tParodo <20>i<EFBFBD> informacij<69>.\n\n"
+
+IDS_LOGOFF_REMOTE, "U<>baigia seans<6E> nutolusioje ma<6D>inoje."
+IDS_LOGOFF_LOCAL, "U<>baigia einam<61>j<EFBFBD> seans<6E> <20>ioje ma<6D>inoje."
+
+IDS_ILLEGAL_PARAM, "Neteisingas(i) parametras(ai)\n"
+}
+/* EOF */

reactos/base/applications/logoff/lang/ru-RU.rc

@@ -0,0 +1,23 @@
+/*
+ * PROJECT:     ReactOS logoff utility
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/logoff/lang/ru-RU.rc
+ * PURPOSE:     Russian Language File for logoff
+ * TRANSLATOR:  Artem Reznikov
+ */
+
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n\
+  /v\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /?\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n"
+
+IDS_LOGOFF_REMOTE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+IDS_LOGOFF_LOCAL, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+
+IDS_ILLEGAL_PARAM, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+}
+/* EOF */

reactos/base/applications/logoff/lang/uk-UA.rc

@@ -0,0 +1,23 @@
+/*
+ * PROJECT:     ReactOS logoff utility
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/logoff/lang/uk-UA.rc
+ * PURPOSE:     Ukraianian Language File for logoff
+ * TRANSLATOR:  Artem Reznikov
+ */
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+
+IDS_USAGE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n\
+  /v\t\t³<74><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 䳿.\n\
+  /?\t\t³<74><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n"
+
+IDS_LOGOFF_REMOTE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+IDS_LOGOFF_LOCAL, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+
+IDS_ILLEGAL_PARAM, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+}
+/* EOF */

reactos/base/applications/logoff/logoff.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="logoff" type="win32cui" installbase="system32" installname="logoff.exe">
 	<include base="logoff">.</include>
 	<define name="__USE_W32API" />

reactos/base/applications/logoff/rsrc.rc

@@ -1,5 +1,12 @@
 #include <windows.h>
 #include "resource.h"
 
+#include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
 #include "lang/en-US.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/lt-LT.rc"
 #include "lang/nb-NO.rc"
+#include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"

reactos/base/applications/mmc/mmc.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes">
 	<include base="mmcclient">.</include>
 	<define name="__USE_W32API" />
@@ -18,4 +18,3 @@
 	<file>mmc.rc</file>
 	<pch>precomp.h</pch>
 </module>
-</rbuild>

reactos/base/applications/msconfig/lang/ca-ES.rc

@@ -0,0 +1,174 @@
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE  0, 0, 378, 220
+STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
+    WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
+    WS_THICKFRAME
+CAPTION "Progrma de configuracio del sistema"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
+    DEFPUSHBUTTON "Acceptar", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Ajuda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Cancel<65>lar", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Aplicar", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
+    PUSHBUTTON      "A&ctivar-ho tot",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
+    PUSHBUTTON      "&Deactivar-ho tot",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14
+END
+
+IDD_SYSTEM_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148
+    PUSHBUTTON      "P&uja", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
+    PUSHBUTTON      "&Baixa", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
+
+    PUSHBUTTON      "Ac&tiva", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
+    PUSHBUTTON      "D&esactiva", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
+
+    PUSHBUTTON      "&Busca", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
+    PUSHBUTTON      "&Nou", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
+    PUSHBUTTON      "Ed&ita", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
+
+    PUSHBUTTON      "A&ctivar-ho tot", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
+    PUSHBUTTON      "&Deactivar-ho tot",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
+END
+
+IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134
+    EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY
+    PUSHBUTTON "&Executa", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
+    PUSHBUTTON      "A&ctivar-ho tot",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
+    PUSHBUTTON      "&Deactivar-ho tot",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14
+END
+
+IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Seleccio d'arrencada", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
+ CONTROL "Arrencada &Normal - Carrega tots els serveis i controladors", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
+ CONTROL "Arrencada de &Diagnostic - Nomes carrega els seveis i controladors basics", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
+ CONTROL "Seleccio &Manual", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
+ CHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
+ CHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
+ CHECKBOX "P&rogrames del menu inici", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+END
+
+IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
+   PUSHBUTTON    "&Prova camins d'arrencada", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
+   PUSHBUTTON    "&Fes-ho per defecte", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12
+   PUSHBUTTON    "P&uja", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
+   PUSHBUTTON    "&Baixa", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
+   GROUPBOX "&Opcions d'arrencada", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
+   CHECKBOX "/&SAFEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
+   CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
+   CHECKBOX "/BOO&TLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
+   CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
+   CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
+   PUSHBUTTON "Op&cions Avan<61>ades...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
+   LTEXT "Temps:", -1, 280, 91, 30, 10
+   EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
+   LTEXT "sec.", -1, 340, 91, 15, 10
+END
+
+IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
+   EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
+   CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11
+   CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10
+   COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10
+   CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10
+   CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12
+   EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT
+   CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10
+   CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10
+   COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10
+   COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10
+   EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT
+   CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11
+   PUSHBUTTON "Acceptar", IDC_OK, 20, 160, 50, 12
+   PUSHBUTTON "Cancel<65>lar", IDC_CANCEL, 100, 160, 50, 12
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_MSCONFIG             "Programa de configuracio de sistema"
+    IDS_TAB_GENERAL          "General"
+    IDS_TAB_SYSTEM           "SYSTEM.INI"
+    IDS_TAB_FREELDR          "FREELDR.INI"
+    IDS_TAB_SERVICES         "Serveis"
+    IDS_TAB_STARTUP          "Arrencada"
+    IDS_TAB_TOOLS            "Eines"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_SERVICES_COLUMN_SERVICE "Servei"
+    IDS_SERVICES_COLUMN_REQ     "Obligatori"
+    IDS_SERVICES_COLUMN_VENDOR  "Fabricant"
+    IDS_SERVICES_COLUMN_STATUS  "Estat"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TOOLS_COLUMN_NAME    "Nom"
+    IDS_TOOLS_COLUMN_DESCR   "Descripcio"
+
+    IDS_TOOLS_CMD_NAME       "Consola"
+    IDS_TOOLS_CMD_DESCR      ""
+    IDS_TOOLS_CMD_CMD        "cmd.exe"
+
+    IDS_TOOLS_INFO_NAME      "Versio"
+    IDS_TOOLS_INFO_DESCR     "Mostra informacio de la versio."
+    IDS_TOOLS_INFO_CMD       "winver.exe"
+
+    IDS_TOOLS_REGEDIT_NAME   "Editor del registre"
+    IDS_TOOLS_REGEDIT_DESCR  "Obre l'editor del registre."
+    IDS_TOOLS_REGEDIT_CMD    "regedit.exe"
+
+    IDS_TOOLS_SYSDM_NAME     "Propietats del sistema"
+    IDS_TOOLS_SYSDM_DESCR    "Mostra la informacio d'aquest ordinador."
+    IDS_TOOLS_SYSDM_CMD      "control"
+    IDS_TOOLS_SYSDM_PARAM    "sysdm.cpl"
+
+    IDS_STARTUP_COLUMN_ELEMENT "Element"
+    IDS_STARTUP_COLUMN_CMD     "Command"
+    IDS_STARTUP_COLUMN_PATH    "Path"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_SERVICES_STATUS_RUNNING "En marxa"
+    IDS_SERVICES_STATUS_STOPPED "Parat"
+    IDS_SERVICES_YES "Si"
+    IDS_SERVICES_UNKNOWN "Indeterminat"
+END

reactos/base/applications/msconfig/lang/it-IT.rc

@@ -28,18 +28,18 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148
-    PUSHBUTTON      "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
-    PUSHBUTTON      "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
+    PUSHBUTTON      "&Sposta su", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
+    PUSHBUTTON      "S&posta gi<67>", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
 
-    PUSHBUTTON      "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
-    PUSHBUTTON      "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
+    PUSHBUTTON      "&Attiva", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
+    PUSHBUTTON      "&Disattiva", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
 
-    PUSHBUTTON      "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
-    PUSHBUTTON      "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
-    PUSHBUTTON      "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
+    PUSHBUTTON      "&Trova", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
+    PUSHBUTTON      "&Nuovo", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
+    PUSHBUTTON      "&Modifica", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
 
-    PUSHBUTTON      "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
-    PUSHBUTTON      "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
+    PUSHBUTTON      "A&bilita tutto", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
+    PUSHBUTTON      "Disabi&lita tutto",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
 END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
@@ -65,30 +65,30 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
  GROUPBOX "Selezione avvio", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
- CONTROL "Avvio &normale: carica tutti i driver di periferica e i servizi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
- CONTROL "Avvio &diagnostico: carica soltanto le periferiche e i servizi di base", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
+ CONTROL "Avvio &normale: carica tutti i driver di periferica e i servizi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 205, 10
+ CONTROL "Avvio &diagnostico: carica soltanto le periferiche e i servizi di base", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 230, 10
  CONTROL "Avvio &selettivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
  CHECKBOX "&Elabora il file SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
  CHECKBOX "&Carica servizi di sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
- CHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+ CHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 95, 10
 END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-   CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
-   PUSHBUTTON    "Ve&rifica percorsi di avvio", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-   PUSHBUTTON    "&Imposta come predefinito", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12
-   PUSHBUTTON    "&Sposta su", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
-   PUSHBUTTON    "S&posta gi<67>", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
-   GROUPBOX "Opzioni di Avvio", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
-   CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
-   CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
-   CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
-   CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
-   CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
-   PUSHBUTTON "Op&zioni avanzate...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 
+   CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 3, 2, 354, 58, 0x00000200
+   PUSHBUTTON    "Ve&rifica percorsi di avvio", IDC_BTN_CHECK_BOOT_PATH, 3, 64, 85, 14
+   PUSHBUTTON    "&Imposta come predefinito", IDC_BTN_SET_DEFAULT_BOOT, 93, 64, 85, 14
+   PUSHBUTTON    "&Sposta su", IDC_BTN_MOVE_UP_BOOT_OPTION, 183, 64, 85, 14
+   PUSHBUTTON    "S&posta gi<67>", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 273, 64, 85, 14
+   GROUPBOX "Opzioni di Avvio", -1, 3, 80, 250, 90,0,WS_EX_TRANSPARENT
+   CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 92, 55, 10
+   CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 107, 60, 10
+   CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 122, 50, 10
+   CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 137, 55, 10
+   CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 152, 50, 10
+   PUSHBUTTON "Op&zioni avanzate...", IDC_BTN_ADVANCED_OPTIONS, 100, 148, 70, 16
    LTEXT "&Timeout:", -1, 280, 91, 30, 10
    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
    LTEXT "sec.", -1, 340, 91, 15, 10

reactos/base/applications/msconfig/lang/pl-PL.rc

@@ -34,18 +34,18 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148
-    PUSHBUTTON      "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
-    PUSHBUTTON      "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
+    PUSHBUTTON      "Przenie<EFBFBD> w &g<>r<EFBFBD>", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
+    PUSHBUTTON      "Przenie<EFBFBD> w &d<><64>", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
 
-    PUSHBUTTON      "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
-    PUSHBUTTON      "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
+    PUSHBUTTON      "W<EFBFBD><EFBFBD>&cz", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
+    PUSHBUTTON      "W&y<><79>cz", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
 
-    PUSHBUTTON      "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
-    PUSHBUTTON      "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
-    PUSHBUTTON      "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
+    PUSHBUTTON      "&Znajd<EFBFBD>", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
+    PUSHBUTTON      "&Nowa", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
+    PUSHBUTTON      "Edy&tuj", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
 
-    PUSHBUTTON      "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
-    PUSHBUTTON      "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
+    PUSHBUTTON      "&W<><57>cz wszystkie", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
+    PUSHBUTTON      "Wy<EFBFBD><EFBFBD>cz wszy&stkie",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
 END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
@@ -94,10 +94,10 @@ BEGIN
    CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
    CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
    CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
-   PUSHBUTTON "&Opcje zaawansowane....", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 
+   PUSHBUTTON "&Opcje zaawansowane...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
    LTEXT "&Limit czasu:", -1, 280, 91, 30, 10
    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-   LTEXT "s.", -1, 340, 91, 15, 10
+   LTEXT "s", -1, 340, 91, 15, 10
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
@@ -157,7 +157,7 @@ BEGIN
     IDS_TOOLS_INFO_DESCR     "Wy<57>wietla informacje o wersji."
     IDS_TOOLS_INFO_CMD       "winver.exe"
 
-    IDS_TOOLS_REGEDIT_NAME   "Edytor-Rejestru"
+    IDS_TOOLS_REGEDIT_NAME   "Edytor rejestru"
     IDS_TOOLS_REGEDIT_DESCR  ""
     IDS_TOOLS_REGEDIT_CMD    "regedit.exe"
 
@@ -174,7 +174,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_SERVICES_STATUS_RUNNING "Dzia<69>a"
-    IDS_SERVICES_STATUS_STOPPED "Zatrzymany"
+    IDS_SERVICES_STATUS_STOPPED "Zatrzymano"
     IDS_SERVICES_YES "Tak"
     IDS_SERVICES_UNKNOWN "Nieznany"
 END

reactos/base/applications/msconfig/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/msconfig/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for msconfig
- * TRANSLATOR:  Rostislav Zabolotny
+ * TRANSLATOR:  Rostislav Zabolotny, Artem Reznikov
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -36,18 +36,18 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148
-    PUSHBUTTON      "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
-    PUSHBUTTON      "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
+    PUSHBUTTON      "<EFBFBD>&<26><><EFBFBD><EFBFBD>", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
+    PUSHBUTTON      "<EFBFBD>&<26><><EFBFBD>", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
 
-    PUSHBUTTON      "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
-    PUSHBUTTON      "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
+    PUSHBUTTON      "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
+    PUSHBUTTON      "<EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
 
-    PUSHBUTTON      "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
-    PUSHBUTTON      "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
-    PUSHBUTTON      "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
+    PUSHBUTTON      "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
+    PUSHBUTTON      "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
+    PUSHBUTTON      "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
 
-    PUSHBUTTON      "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
-    PUSHBUTTON      "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
+    PUSHBUTTON      "<EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
+    PUSHBUTTON      "<EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
 END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175

reactos/base/applications/msconfig/msconfig.c

@@ -141,11 +141,22 @@ MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     int             idctrl;
     LPNMHDR         pnmh;
+	static 			HICON hIcon;
 
     switch (message)
     {
         case WM_INITDIALOG:
             hMainWnd = hDlg;
+            hIcon = LoadImage(GetModuleHandle(NULL),
+                              MAKEINTRESOURCE(IDI_APPICON),
+                              IMAGE_ICON,
+                              16,
+                              16,
+                              0);
+            SendMessage(hDlg,
+                        WM_SETICON,
+                        ICON_SMALL,
+                        (LPARAM)hIcon);
             return OnCreate(hDlg);
 
         case WM_COMMAND:

reactos/base/applications/msconfig/msconfig.rbuild

@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe">
 	<include base="msconfig">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>

reactos/base/applications/msconfig/msconfig.rc

@@ -12,6 +12,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define REACTOS_STR_ORIGINAL_FILENAME	"msconfig.exe\0"
 #include <reactos/version.rc>
 
+IDI_APPICON   ICON "res/msconfig.ico"
 
 #include "rsrc.rc"
 
+

reactos/base/applications/msconfig/resource.h

@@ -111,4 +111,6 @@
 
 #define IDS_MSCONFIG                    3000
 
+#define IDI_APPICON						3001
+
 /* EOF */

reactos/base/applications/msconfig/rsrc.rc

@@ -10,6 +10,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 /* include localised resources */
 
 #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"