From f316f00072afbd0c35de094463c88e5f0a45ab52 Mon Sep 17 00:00:00 2001
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Tue, 9 Mar 2010 17:21:29 +0000
Subject: [PATCH] Convert battery.inf to UTF-16 Add French translation. Add
 battery.inf and fdc.inf to syssetup process.

Floppy disk controllers and batteries now appear correctly in device manager.
Dedicated to aicom ;)

svn path=/trunk/; revision=46038
---
 reactos/media/inf/battery.inf      | Bin 1078 -> 2574 bytes
 reactos/media/inf/inf.rbuild       |   4 +++-
 reactos/media/inf/syssetup.inf.tpl |   2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/reactos/media/inf/battery.inf b/reactos/media/inf/battery.inf
index 9ac8d8995e5707d475ed1e6ecc3d881818cef6f7..33a8fb887a2bd0511ffb4e0c71a8c4d1e750e0bf 100644
GIT binary patch
literal 2574
zcmbuATTc^F5Xa}aiQi$<xQQmPZVL*L_&{60MnM923lIWr!6v1xZBZNJclDKbpTXbE
z>FHjmh?33O%Q-XipZU*audh}lkczCz9@m=e$VZ8!E?crL52RpgU*1Ve1~Qbk^rS0?
zw!6#M8DGaTk_%2-*a_qXt0)iUJ*Qo1BL5Y=0DF7v7EN<SZr9zx*0D6O`vys`^_smg
z_Ac08$9l&Q6|a*zi46DDaH@7PG<@~VU8+$ruSXWuI48RyZ;8KV(klC1mZU7tWI;;s
z^HdgPo}FbF)3*{=O=8|EQpK+&-eRs*E`3(msi0ft`-dTI!&Ohd;AhkD6R$$pPe&e_
zd=2?F@|ppc2h~u|Vyr%4E!#cDlUU}sM~0kauZHdr)-)rUEtka_PtB>zrplahdI4u6
zB61o|#-Wu!N^B<F*0HMAkJ0Q{q>*LY*<B^drp0wO@jA<WV#jGk@RVpIc>kj1kYCCx
zaOXhv%U8gxr!p5vn5&G$yDj27hn0|?SRv1K`5>Fr!*jHp#{qmctUm(zgrs&v;{PW4
zUD#EQwX$8u3?}S{vVnBhwA9Kba%W&U=4YKHmS>$F;$?_mRoTYV1MXX_m~XAj$nvWd
z*Z|Sxx-mto5~pW-?vFMUKaJqAwB}=~;Qui4Rtli(<8|VZ%WV~&`%D8r2Xw+{N2Dc>
z_{vM&v^Psi*=vA#Las(!5%oQ06{b6l)Sfbt^)X^<Y5qOKzQ<ghWY3)6X*8|FSiTvL
zj!nIntv<8yWi1_%>2xQ~iuHC4jXNu`N8Ej4NoG{ZYI@iDeZV~{;V09ANv*+w&bonR
zqKmYCb<CP(%iBtGRiP?%N)14E+=R%LskMWdIZ^hNfAvV`WS742d}pVrvsTQ_*nkLh
z=AQF!DopEMJsRV+{#o?@;k)14@cp53ZS;qeKbv|ps~^4IqugmQt*FG(WAns!!rgk;
z+xJ@YaMdHGJ`uEuLAeiXFP#OQXCr1+kBOW0WSsNC+r7QJ(_RFiHd%cTG&W`TW}fs<
zwaBV62k*!J-*~^7v4Bdsgqcgr;b$hY=J7u4=P?5L39siMc$T%3n&6~!@rxY!9nF~g
mL!V4`J@d++e?OSM-8COR6KcC<|DJ$YTU3PqF3R;)L4E@+yO8Gq

literal 1078
zcmaJ=ZHwAK5dOZ9|FDD$v=DQfc&$gp4|&n6v|7>hjXRNTvU&@7k<DrwO8<Ljlhs&T
zx`OP?JoC&mJCh*}{5T#jzdF<T#6Sjm{KQ1X%VKSy72g$99t6X9gw31JyhzLM6`sd8
zrh$f6(Iuma{IF7?_p~k#a>6qPd0AsPyx1Bj%xG2N=8SMarDUSk-iMFVNR|0H@Lu=b
z@vFPu;NHLMxo$*yK{y%o2=RSFf<e&t{9guIi1Nr&CV*^&EnVC)P$c+~3FtxjiFfPW
z-+II)w(Ahmv=^~Ta%c-$jJT+v&4_L3A(JWq9!PV&2HB{c7L}w~*7uxw3|K!+muv?Z
zt-irP$Y}#j-oHbT{Px|_#_IRyAvU%ybLKQ>78*{bUuNSs7>F@X$^t(#!5aP<Ee>0F
zY#59HR_lQkOz>p3-B}>4vl?(`u94-3i|Ny1z91p-oroQI!l3I!rG>eYU|%ADx-r!s
zA*BDGj1vT*$Ce0mh2_3hJ5Zh3H)q!w*SXdx$-jXFr>ZNYE=hBPg=`s}6%$IZni#x^
zwt%}$voZMrBGvJ1-OWaWHhPF%)vLf7X-8b|VcCJyh3%JANbOLrzJbO<lp-t(Da!1G
zYE=cWQlbWw<$Bgr*NFi&S5oj|r*!Kz1(<od#*F4Bx*oqmv_8%%_@WHd%~8c(XcMc4
zg5k63rHL+QcQGr4SD{`~=KGA(LSk5_riGlz=Q7nKwPrZY@-GTZQ@V$0CPKdfXCy`e

diff --git a/reactos/media/inf/inf.rbuild b/reactos/media/inf/inf.rbuild
index d430394cad7..44ea108fd6e 100644
--- a/reactos/media/inf/inf.rbuild
+++ b/reactos/media/inf/inf.rbuild
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-	<installfile installbase="inf">audio.inf</installfile>
 	<installfile installbase="inf">acpi.inf</installfile>
+	<installfile installbase="inf">audio.inf</installfile>
+	<installfile installbase="inf">battery.inf</installfile>
 	<installfile installbase="inf">cdrom.inf</installfile>
 	<installfile installbase="inf">display.inf</installfile>
+	<installfile installbase="inf">fdc.inf</installfile>
 	<installfile installbase="inf">font.inf</installfile>
 	<installfile installbase="inf">hdc.inf</installfile>
 	<installfile installbase="inf">intl.inf</installfile>
diff --git a/reactos/media/inf/syssetup.inf.tpl b/reactos/media/inf/syssetup.inf.tpl
index 6aaa0a2141c..f1c7ff67ce6 100644
--- a/reactos/media/inf/syssetup.inf.tpl
+++ b/reactos/media/inf/syssetup.inf.tpl
@@ -14,8 +14,10 @@ ClassGUID={00000000-0000-0000-0000-000000000000}
 [DeviceInfsToInstall]
 ; MS uses netnovel.inf as class-installer INF for NICs
 ; we use a separate one to keep things clean
+battery.inf
 cdrom.inf
 display.inf
+fdc.inf
 hdc.inf
 keyboard.inf
 machine.inf