Sync with trunk r63793.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 1 Aug 2014 18:39:52 +0000 (18:39 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 1 Aug 2014 18:39:52 +0000 (18:39 +0000)
svn path=/branches/condrv_restructure/; revision=63794

282 files changed:
1  2 
base/applications/cmdutils/help/lang/ro-RO.rc
base/applications/cmdutils/help/lang/uk-UA.rc
base/applications/cmdutils/xcopy/lang/Ro.rc
base/applications/games/solitaire/lang/bg-BG.rc
base/applications/games/solitaire/lang/ca-ES.rc
base/applications/games/solitaire/lang/cs-CZ.rc
base/applications/games/solitaire/lang/de-DE.rc
base/applications/games/solitaire/lang/el-GR.rc
base/applications/games/solitaire/lang/en-US.rc
base/applications/games/solitaire/lang/es-ES.rc
base/applications/games/solitaire/lang/eu-ES.rc
base/applications/games/solitaire/lang/fr-FR.rc
base/applications/games/solitaire/lang/he-IL.rc
base/applications/games/solitaire/lang/hu-HU.rc
base/applications/games/solitaire/lang/id-ID.rc
base/applications/games/solitaire/lang/it-IT.rc
base/applications/games/solitaire/lang/ja-JP.rc
base/applications/games/solitaire/lang/ko-KR.rc
base/applications/games/solitaire/lang/lt-LT.rc
base/applications/games/solitaire/lang/nl-NL.rc
base/applications/games/solitaire/lang/no-NO.rc
base/applications/games/solitaire/lang/pl-PL.rc
base/applications/games/solitaire/lang/ro-RO.rc
base/applications/games/solitaire/lang/ru-RU.rc
base/applications/games/solitaire/lang/sk-SK.rc
base/applications/games/solitaire/lang/sq-AL.rc
base/applications/games/solitaire/lang/sv-SE.rc
base/applications/games/solitaire/lang/th-TH.rc
base/applications/games/solitaire/lang/tr-TR.rc
base/applications/games/solitaire/lang/uk-UA.rc
base/applications/games/solitaire/lang/zh-CN.rc
base/applications/games/solitaire/lang/zh-TW.rc
base/applications/games/solitaire/solcreate.cpp
base/applications/games/solitaire/solitaire.h
base/applications/games/spider/lang/bg-BG.rc
base/applications/games/spider/lang/de-DE.rc
base/applications/games/spider/lang/en-US.rc
base/applications/games/spider/lang/es-ES.rc
base/applications/games/spider/lang/fr-FR.rc
base/applications/games/spider/lang/he-IL.rc
base/applications/games/spider/lang/hu-HU.rc
base/applications/games/spider/lang/it-IT.rc
base/applications/games/spider/lang/ja-JP.rc
base/applications/games/spider/lang/nl-NL.rc
base/applications/games/spider/lang/pl-PL.rc
base/applications/games/spider/lang/pt-BR.rc
base/applications/games/spider/lang/ro-RO.rc
base/applications/games/spider/lang/ru-RU.rc
base/applications/games/spider/lang/sk-SK.rc
base/applications/games/spider/lang/sq-AL.rc
base/applications/games/spider/lang/sv-SE.rc
base/applications/games/spider/lang/tr-TR.rc
base/applications/games/spider/lang/uk-UA.rc
base/applications/games/spider/lang/zh-CN.rc
base/applications/games/spider/lang/zh-TW.rc
base/applications/games/spider/spider.cpp
base/applications/games/spider/spider.h
base/applications/mscutils/eventvwr/lang/ro-RO.rc
base/applications/network/net/lang/ro-RO.rc
base/applications/network/net/net.rc
base/applications/rapps/rapps/7zip.txt
base/applications/rapps/rapps/abyss.txt
base/applications/rapps/rapps/ac97forvirtualbox.txt
base/applications/rapps/rapps/alreader.txt
base/applications/rapps/rapps/ants.txt
base/applications/rapps/rapps/bittorrent.txt
base/applications/rapps/rapps/bochs.txt
base/applications/rapps/rapps/boundaround.txt
base/applications/rapps/rapps/christmasbound.txt
base/applications/rapps/rapps/cnt.txt
base/applications/rapps/rapps/codeblocks.txt
base/applications/rapps/rapps/codeblocks_gcc.txt
base/applications/rapps/rapps/codeblocks_gcc_2.txt
base/applications/rapps/rapps/devcpp_mingw32.txt
base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt
base/applications/rapps/rapps/doublecommander.txt
base/applications/rapps/rapps/dplus.txt
base/applications/rapps/rapps/fap.txt
base/applications/rapps/rapps/fira.txt
base/applications/rapps/rapps/firefox.txt
base/applications/rapps/rapps/firefox36.txt
base/applications/rapps/rapps/freebasic.txt
base/applications/rapps/rapps/ghostscript.txt
base/applications/rapps/rapps/ghostview.txt
base/applications/rapps/rapps/irfanview.txt
base/applications/rapps/rapps/irfanviewplugins.txt
base/applications/rapps/rapps/lazaruside.txt
base/applications/rapps/rapps/libreoffice.txt
base/applications/rapps/rapps/mcwin32.txt
base/applications/rapps/rapps/miktex.txt
base/applications/rapps/rapps/mirandaim.txt
base/applications/rapps/rapps/mirc.txt
base/applications/rapps/rapps/mono2.txt
base/applications/rapps/rapps/mpc.txt
base/applications/rapps/rapps/net11.txt
base/applications/rapps/rapps/net20sp2.txt
base/applications/rapps/rapps/nirlauncher.txt
base/applications/rapps/rapps/npp.txt
base/applications/rapps/rapps/offbyone.txt
base/applications/rapps/rapps/openoffice.txt
base/applications/rapps/rapps/openoffice2.4.txt
base/applications/rapps/rapps/openttd.txt
base/applications/rapps/rapps/opera.txt
base/applications/rapps/rapps/opera9.txt
base/applications/rapps/rapps/peazip.txt
base/applications/rapps/rapps/pptview.txt
base/applications/rapps/rapps/ptanks.txt
base/applications/rapps/rapps/python.txt
base/applications/rapps/rapps/qmmp.txt
base/applications/rapps/rapps/rosbearm.txt
base/applications/rapps/rapps/sbforvmware.txt
base/applications/rapps/rapps/scite.txt
base/applications/rapps/rapps/scummvm.txt
base/applications/rapps/rapps/sdl_mixer.txt
base/applications/rapps/rapps/sdl_runtime.txt
base/applications/rapps/rapps/seamonkey.txt
base/applications/rapps/rapps/smplayer.txt
base/applications/rapps/rapps/snoopy.txt
base/applications/rapps/rapps/sumatrapdf.txt
base/applications/rapps/rapps/summerbound.txt
base/applications/rapps/rapps/supertux.txt
base/applications/rapps/rapps/thunderbird.txt
base/applications/rapps/rapps/totalcommander.txt
base/applications/rapps/rapps/ultravnc.txt
base/applications/rapps/rapps/utorrent.txt
base/applications/rapps/rapps/vlc.txt
base/setup/reactos/lang/ro-RO.rc
base/setup/usetup/lang/ro-RO.h
base/setup/vmwinst/lang/ro-RO.rc
base/shell/cmd/cmd.rc
base/system/diskpart/lang/en-US.rc
base/system/format/lang/de-DE.rc
base/system/regsvr32/lang/de-DE.rc
base/system/rundll32/lang/de-DE.rc
base/system/runonce/lang/de-DE.rc
base/system/subst/lang/de-DE.rc
base/system/subst/subst.rc
base/system/winlogon/lang/de-DE.rc
base/system/winlogon/lang/ro-RO.rc
boot/bootdata/hivecls.inf
dll/cpl/appwiz/lang/ro-RO.rc
dll/cpl/hdwwiz/lang/ro-RO.rc
dll/cpl/liccpa/lang/ro-RO.rc
dll/cpl/sysdm/lang/ro-RO.rc
dll/cpl/wined3dcfg/lang/ro-RO.rc
dll/directx/wine/dsound/dsound_main.c
dll/directx/wine/quartz/enumfilters.c
dll/directx/wine/quartz/filesource.c
dll/directx/wine/quartz/nullrenderer.c
dll/directx/wine/quartz/parser.c
dll/ntdll/ldr/ldrutils.c
dll/opengl/opengl32/dllmain.c
dll/opengl/opengl32/icdload.c
dll/opengl/opengl32/opengl32.h
dll/opengl/opengl32/wgl.c
dll/win32/advapi32/reg/reg.c
dll/win32/cards/cards.h
dll/win32/cards/res/default/Background_1.bmp
dll/win32/cards/res/default/Background_10.bmp
dll/win32/cards/res/default/Background_11.bmp
dll/win32/cards/res/default/Background_12.bmp
dll/win32/cards/res/default/Background_2.bmp
dll/win32/cards/res/default/Background_3.bmp
dll/win32/cards/res/default/Background_4.bmp
dll/win32/cards/res/default/Background_5.bmp
dll/win32/cards/res/default/Background_6.bmp
dll/win32/cards/res/default/Background_7.bmp
dll/win32/cards/res/default/Background_8.bmp
dll/win32/cards/res/default/Background_9.bmp
dll/win32/cards/res/default/Clubs_Ace.bmp
dll/win32/cards/res/default/Clubs_Eight.bmp
dll/win32/cards/res/default/Clubs_Five.bmp
dll/win32/cards/res/default/Clubs_Four.bmp
dll/win32/cards/res/default/Clubs_Jack.bmp
dll/win32/cards/res/default/Clubs_King.bmp
dll/win32/cards/res/default/Clubs_Nine.bmp
dll/win32/cards/res/default/Clubs_Queen.bmp
dll/win32/cards/res/default/Clubs_Seven.bmp
dll/win32/cards/res/default/Clubs_Six.bmp
dll/win32/cards/res/default/Clubs_Ten.bmp
dll/win32/cards/res/default/Clubs_Three.bmp
dll/win32/cards/res/default/Clubs_Two.bmp
dll/win32/cards/res/default/Diamonds_Ace.bmp
dll/win32/cards/res/default/Diamonds_Eight.bmp
dll/win32/cards/res/default/Diamonds_Five.bmp
dll/win32/cards/res/default/Diamonds_Four.bmp
dll/win32/cards/res/default/Diamonds_Jack.bmp
dll/win32/cards/res/default/Diamonds_King.bmp
dll/win32/cards/res/default/Diamonds_Nine.bmp
dll/win32/cards/res/default/Diamonds_Queen.bmp
dll/win32/cards/res/default/Diamonds_Seven.bmp
dll/win32/cards/res/default/Diamonds_Six.bmp
dll/win32/cards/res/default/Diamonds_Ten.bmp
dll/win32/cards/res/default/Diamonds_Three.bmp
dll/win32/cards/res/default/Diamonds_Two.bmp
dll/win32/cards/res/default/FreeCard.bmp
dll/win32/cards/res/default/Hearts_Ace.bmp
dll/win32/cards/res/default/Hearts_Eight.bmp
dll/win32/cards/res/default/Hearts_Five.bmp
dll/win32/cards/res/default/Hearts_Four.bmp
dll/win32/cards/res/default/Hearts_Jack.bmp
dll/win32/cards/res/default/Hearts_King.bmp
dll/win32/cards/res/default/Hearts_Nine.bmp
dll/win32/cards/res/default/Hearts_Queen.bmp
dll/win32/cards/res/default/Hearts_Seven.bmp
dll/win32/cards/res/default/Hearts_Six.bmp
dll/win32/cards/res/default/Hearts_Ten.bmp
dll/win32/cards/res/default/Hearts_Three.bmp
dll/win32/cards/res/default/Hearts_Two.bmp
dll/win32/cards/res/default/Joker.bmp
dll/win32/cards/res/default/OSign.bmp
dll/win32/cards/res/default/Spades_Ace.bmp
dll/win32/cards/res/default/Spades_Eight.bmp
dll/win32/cards/res/default/Spades_Five.bmp
dll/win32/cards/res/default/Spades_Four.bmp
dll/win32/cards/res/default/Spades_Jack.bmp
dll/win32/cards/res/default/Spades_King.bmp
dll/win32/cards/res/default/Spades_Nine.bmp
dll/win32/cards/res/default/Spades_Queen.bmp
dll/win32/cards/res/default/Spades_Seven.bmp
dll/win32/cards/res/default/Spades_Six.bmp
dll/win32/cards/res/default/Spades_Ten.bmp
dll/win32/cards/res/default/Spades_Three.bmp
dll/win32/cards/res/default/Spades_Two.bmp
dll/win32/cards/res/default/XSign.bmp
dll/win32/msgina/gui.c
dll/win32/msgina/lang/bg-BG.rc
dll/win32/msgina/lang/cs-CZ.rc
dll/win32/msgina/lang/de-DE.rc
dll/win32/msgina/lang/en-US.rc
dll/win32/msgina/lang/es-ES.rc
dll/win32/msgina/lang/fr-FR.rc
dll/win32/msgina/lang/he-IL.rc
dll/win32/msgina/lang/id-ID.rc
dll/win32/msgina/lang/it-IT.rc
dll/win32/msgina/lang/ja-JP.rc
dll/win32/msgina/lang/no-NO.rc
dll/win32/msgina/lang/pl-PL.rc
dll/win32/msgina/lang/ro-RO.rc
dll/win32/msgina/lang/ru-RU.rc
dll/win32/msgina/lang/sk-SK.rc
dll/win32/msgina/lang/sq-AL.rc
dll/win32/msgina/lang/tr-TR.rc
dll/win32/msgina/lang/uk-UA.rc
dll/win32/msgina/msgina.c
dll/win32/msgina/msgina.h
dll/win32/msgina/resource.h
dll/win32/newdev/lang/ro-RO.rc
dll/win32/ole32/ole32.spec
dll/win32/rasdlg/lang/ro-RO.rc
dll/win32/samlib/precomp.h
dll/win32/samlib/samlib.c
dll/win32/syssetup/lang/ro-RO.rc
drivers/ksfilter/ks/precomp.h
drivers/ksfilter/ks/swenum.c
include/ndk/amd64/mmtypes.h
include/ndk/arm/mmtypes.h
include/ndk/i386/mmtypes.h
include/ndk/mmtypes.h
include/reactos/wine/strmbase.h
lib/3rdparty/strmbase/filter.c
lib/3rdparty/strmbase/renderer.c
lib/3rdparty/strmbase/transform.c
lib/drivers/libusb/hub_controller.cpp
lib/rtl/sd.c
lib/sdk/crt/printf/swprintf_s.c
lib/sdk/crt/printf/wvsnprintfW.c
lib/sdk/crt/printf/wvsprintfW.c
ntoskrnl/config/cmse.c
subsystems/ntvdm/lang/ro-RO.rc
subsystems/ntvdm/ntvdm.rc
win32ss/gdi/eng/driverobj.c
win32ss/gdi/eng/engwindow.c
win32ss/gdi/ntgdi/dclife.c
win32ss/gdi/ntgdi/wingl.c
win32ss/user/ntuser/ntuser.c
win32ss/user/ntuser/windc.c
win32ss/user/user32/lang/ro-RO.rc
win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
win32ss/user/winsrv/consrv/lang/ro-RO.rc
win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc
win32ss/user/winsrv/consrv_new/lang/ro-RO.rc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,9f08074..9f08074
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 8bbbc98,796bfc3..796bfc3
Binary files differ
index 42fd106,24e06a6..24e06a6
Binary files differ
index 0403a29,80a9055..80a9055
Binary files differ
index 496e752,5bf64ee..5bf64ee
Binary files differ
index b29e023,4873f86..4873f86
Binary files differ
index f97410e,ee440b0..ee440b0
Binary files differ
index e7acccc,0a49309..0a49309
Binary files differ
index 271e2a2,1c68ad0..1c68ad0
Binary files differ
index 5e68611,d5ea09d..d5ea09d
Binary files differ
index 04f677d,d15c321..d15c321
Binary files differ
index 11248fa,ea01402..ea01402
Binary files differ
index 7baff3f,9191f4e..9191f4e
Binary files differ
index cc4ed36,fecefae..fecefae
Binary files differ
index fbb0743,384c87d..384c87d
Binary files differ
index a8873d1,40a3adf..40a3adf
Binary files differ
index b364d01,7ecfbf3..7ecfbf3
Binary files differ
index 12356c4,3050eb6..3050eb6
Binary files differ
index e3188f7,f97061a..f97061a
Binary files differ
index e178860,401adfb..401adfb
Binary files differ
index bf0f5c9,5938cd0..5938cd0
Binary files differ
index 63ff5a2,97b2a4e..97b2a4e
Binary files differ
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/rtl/sd.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,80da090..80da090
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge