A Patch to use xml-i18n-tools correctly with the screensaver files

[Carlos Perelló Marín <carlos gnome-db org>]

Could I commit?

Thanks.

-- 
Carlos Perelló Marín
mailto:carlos gnome-db org
mailto:carlos hispalinux es
http://www.gnome-db.org
http://www.Hispalinux.es
Valencia - Spain

Index: capplets/screensaver/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/screensaver/ChangeLog,v
retrieving revision 1.50
diff -u -w -r1.50 ChangeLog
--- capplets/screensaver/ChangeLog	2001/08/10 03:36:15	1.50
+++ capplets/screensaver/ChangeLog	2001/08/10 09:45:43
@@ -1,3 +1,7 @@
+2001-08-10  Carlos Perelló Marín <carlos gnome-db org>
+
+	* Makefile.am: Disabled desktop.png. It doesn't exists.
+
 2001-08-09  Richard Hestilow  <hestilow ximian com>
 
 	* Makeflie.am (EXTRA_DIST): Install all pixmaps.
Index: capplets/screensaver/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/screensaver/Makefile.am,v
retrieving revision 1.21
diff -u -w -r1.21 Makefile.am
--- capplets/screensaver/Makefile.am	2001/08/10 03:36:15	1.21
+++ capplets/screensaver/Makefile.am	2001/08/10 09:45:43
@@ -19,7 +19,8 @@
 	resources.c				resources.h\
 	XScreenSaver_ad.h
 
-pixmaps_DATA = no-hack.png blank-screen.png screen.png 
+pixmaps_DATA = no-hack.png blank-screen.png
+#screen.png 
 
 ##
 ## You should not need to modify anything below this line
Index: capplets/screensaver/screensavers/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/screensaver/screensavers/Makefile.am,v
retrieving revision 1.16
diff -u -w -r1.16 Makefile.am
--- capplets/screensaver/screensavers/Makefile.am	2001/08/10 03:36:15	1.16
+++ capplets/screensaver/screensavers/Makefile.am	2001/08/10 09:45:43
@@ -147,16 +147,7 @@
 	xteevee.xml \
 	zoom.xml 
 
-Translatables = $(Screensavers:.xml=.xml.h)
-$(Translatables): %.xml.h: %.xml
-	$(top_srcdir)/xml-i18n-extract --type=gettext/xml $<
-
-all: $(Translatables)
-
-EXTRA_DIST = $(Screensavers) README \
-	     $(Translatables)
-
-CLEANFILES = $(Translatables)
+EXTRA_DIST = $(Screensavers) README
 
 ADFILE = $(XSCREENSAVER_PREFIX)/lib/X11/app-defaults/XScreenSaver
 
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/po/ChangeLog,v
retrieving revision 1.296
diff -u -w -r1.296 ChangeLog
--- po/ChangeLog	2001/08/10 03:36:17	1.296
+++ po/ChangeLog	2001/08/10 09:45:43
@@ -1,3 +1,7 @@
+2001-08-10  Carlos Perelló Marín <carlos gnome-db org>
+
+	* POTFILES.in: Fixed the screensaver files.
+
 2001-08-09  Richard Hestilow <hestilow ximian com>
 
 	* Added lots of xml.h files to POTFILES.in. There were
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/po/POTFILES.in,v
retrieving revision 1.80
diff -u -w -r1.80 POTFILES.in
--- po/POTFILES.in	2001/08/10 03:36:17	1.80
+++ po/POTFILES.in	2001/08/10 09:45:43
@@ -9,6 +9,7 @@
 capplets/default-applications/default-applications.desktop.in.in
 capplets/default-applications/interface.c
 capplets/default-applications/support.c
+capplets/desktop-links/gnome-hint-properties.desktop.in
 capplets/keyboard/keyboard.desktop.in.in
 capplets/keyboard/keyboard-properties.glade
 capplets/keyboard/main.c
@@ -17,203 +18,153 @@
 capplets/mouse/prefs-widget.c
 capplets/screensaver/preferences.c
 capplets/screensaver/prefs-widget.c
-capplets/screensaver/screensaver-prefs-dialog.c
 capplets/screensaver/screensaver.desktop.in.in
+capplets/screensaver/screensaver-prefs-dialog.c
 capplets/screensaver/screensaver-properties.glade
 capplets/screensaver/screensavers/3d_clock.xml
 capplets/screensaver/screensavers/ant.xml
+capplets/screensaver/screensavers/atlantis.xml
 capplets/screensaver/screensavers/attraction.xml
+capplets/screensaver/screensavers/blaster.xml
 capplets/screensaver/screensavers/blitspin.xml
 capplets/screensaver/screensavers/bouboule.xml
 capplets/screensaver/screensavers/braid.xml
 capplets/screensaver/screensavers/bsod.xml
+capplets/screensaver/screensavers/bubble3d.xml
 capplets/screensaver/screensavers/bubbles.xml
+capplets/screensaver/screensavers/bumps.xml
+capplets/screensaver/screensavers/cage.xml
+capplets/screensaver/screensavers/ccurve.xml
 capplets/screensaver/screensavers/compass.xml
 capplets/screensaver/screensavers/coral.xml
+capplets/screensaver/screensavers/cosmos.xml
+capplets/screensaver/screensavers/critical.xml
 capplets/screensaver/screensavers/crystal.xml
 capplets/screensaver/screensavers/cynosure.xml
+capplets/screensaver/screensavers/dangerball.xml
 capplets/screensaver/screensavers/decayscreen.xml
 capplets/screensaver/screensavers/deco.xml
+capplets/screensaver/screensavers/deluxe.xml
+capplets/screensaver/screensavers/demon.xml
 capplets/screensaver/screensavers/discrete.xml
+capplets/screensaver/screensavers/distort.xml
 capplets/screensaver/screensavers/drift.xml
+capplets/screensaver/screensavers/electricsheep.xml
 capplets/screensaver/screensavers/epicycle.xml
+capplets/screensaver/screensavers/extrusion.xml
 capplets/screensaver/screensavers/fadeplot.xml
 capplets/screensaver/screensavers/flag.xml
 capplets/screensaver/screensavers/flame.xml
+capplets/screensaver/screensavers/flow.xml
 capplets/screensaver/screensavers/forest.xml
+capplets/screensaver/screensavers/galaxy.xml
+capplets/screensaver/screensavers/gears.xml
+capplets/screensaver/screensavers/gflux.xml
+capplets/screensaver/screensavers/glplanet.xml
+capplets/screensaver/screensavers/gltext.xml
+capplets/screensaver/screensavers/goban.xml
 capplets/screensaver/screensavers/goop.xml
 capplets/screensaver/screensavers/grav.xml
 capplets/screensaver/screensavers/greynetic.xml
 capplets/screensaver/screensavers/halo.xml
 capplets/screensaver/screensavers/helix.xml
 capplets/screensaver/screensavers/hopalong.xml
+capplets/screensaver/screensavers/hyperball.xml
 capplets/screensaver/screensavers/hypercube.xml
 capplets/screensaver/screensavers/ifs.xml
+capplets/screensaver/screensavers/imsmap.xml
+capplets/screensaver/screensavers/interference.xml
 capplets/screensaver/screensavers/jigsaw.xml
 capplets/screensaver/screensavers/julia.xml
 capplets/screensaver/screensavers/kaleidescope.xml
+capplets/screensaver/screensavers/kumppa.xml
+capplets/screensaver/screensavers/lament.xml
 capplets/screensaver/screensavers/laser.xml
 capplets/screensaver/screensavers/lightning.xml
 capplets/screensaver/screensavers/lisa.xml
+capplets/screensaver/screensavers/lissie.xml
 capplets/screensaver/screensavers/lmorph.xml
+capplets/screensaver/screensavers/loop.xml
 capplets/screensaver/screensavers/maze.xml
+capplets/screensaver/screensavers/moebius.xml
+capplets/screensaver/screensavers/moire2.xml
 capplets/screensaver/screensavers/moire.xml
+capplets/screensaver/screensavers/molecule.xml
+capplets/screensaver/screensavers/morph3d.xml
+capplets/screensaver/screensavers/mountain.xml
 capplets/screensaver/screensavers/munch.xml
+capplets/screensaver/screensavers/nerverot.xml
+capplets/screensaver/screensavers/noseguy.xml
 capplets/screensaver/screensavers/pedal.xml
+capplets/screensaver/screensavers/penetrate.xml
+capplets/screensaver/screensavers/penrose.xml
+capplets/screensaver/screensavers/petri.xml
+capplets/screensaver/screensavers/phosphor.xml
+capplets/screensaver/screensavers/pipes.xml
+capplets/screensaver/screensavers/pulsar.xml
 capplets/screensaver/screensavers/pyro.xml
 capplets/screensaver/screensavers/qix.xml
+capplets/screensaver/screensavers/rd-bomb.xml
+capplets/screensaver/screensavers/ripples.xml
+capplets/screensaver/screensavers/rocks.xml
 capplets/screensaver/screensavers/rorschach.xml
+capplets/screensaver/screensavers/rotor.xml
+capplets/screensaver/screensavers/rotzoomer.xml
+capplets/screensaver/screensavers/rubiks_cube.xml
+capplets/screensaver/screensavers/rubik.xml
+capplets/screensaver/screensavers/shadebobs.xml
+capplets/screensaver/screensavers/sierpinski3d.xml
 capplets/screensaver/screensavers/sierpinski.xml
+capplets/screensaver/screensavers/slidescreen.xml
+capplets/screensaver/screensavers/slip.xml
+capplets/screensaver/screensavers/sonar.xml
+capplets/screensaver/screensavers/speedmine.xml
+capplets/screensaver/screensavers/sphere.xml
 capplets/screensaver/screensavers/spiral.xml
+capplets/screensaver/screensavers/spotlight.xml
+capplets/screensaver/screensavers/sproingies.xml
+capplets/screensaver/screensavers/squiral.xml
+capplets/screensaver/screensavers/ssystem.xml
+capplets/screensaver/screensavers/stairs.xml
 capplets/screensaver/screensavers/starfish.xml
+capplets/screensaver/screensavers/starwars.xml
+capplets/screensaver/screensavers/stonerview.xml
+capplets/screensaver/screensavers/strange.xml
+capplets/screensaver/screensavers/superquadrics.xml
+capplets/screensaver/screensavers/swirl.xml
+capplets/screensaver/screensavers/t3d.xml
 capplets/screensaver/screensavers/triangle.xml
+capplets/screensaver/screensavers/truchet.xml
+capplets/screensaver/screensavers/vidwhacker.xml
 capplets/screensaver/screensavers/vines.xml
+capplets/screensaver/screensavers/wander.xml
+capplets/screensaver/screensavers/webcollage.xml
+capplets/screensaver/screensavers/whirlwindwarp.xml
+capplets/screensaver/screensavers/whirlygig.xml
+capplets/screensaver/screensavers/worm.xml
+capplets/screensaver/screensavers/xaos.xml
+capplets/screensaver/screensavers/xdaliclock.xml
+capplets/screensaver/screensavers/xearth.xml
+capplets/screensaver/screensavers/xfishtank.xml
+capplets/screensaver/screensavers/xflame.xml
+capplets/screensaver/screensavers/xjack.xml
+capplets/screensaver/screensavers/xlyap.xml
+capplets/screensaver/screensavers/xmatrix.xml
+capplets/screensaver/screensavers/xmountains.xml
+capplets/screensaver/screensavers/xrayswarm.xml
 capplets/screensaver/screensavers/xroger.xml
+capplets/screensaver/screensavers/xsnow.xml
+capplets/screensaver/screensavers/xspirograph.xml
+capplets/screensaver/screensavers/xteevee.xml
+capplets/screensaver/screensavers/zoom.xml
 capplets/screensaver/selection-dialog.c
-capplets/sound/sound-properties-capplet.c
 capplets/sound/sound.desktop.in.in
+capplets/sound/sound-properties-capplet.c
 capplets/sound/sound-properties.glade
-control-center/Gnome.directory.in.in
 control-center/capplet-dir.c
 control-center/capplet-dir-view.c
 control-center/capplet-dir-view-html.c
 control-center/gnomecc.desktop.in
 control-center/gnomecc.glade
+control-center/Gnome.directory.in.in
 control-center/main.c
-capplets/desktop-links/gnome-hint-properties.desktop.in
-capplets/screensaver/screensavers/3d_clock.xml.h
-capplets/screensaver/screensavers/ant.xml.h
-capplets/screensaver/screensavers/atlantis.xml.h
-capplets/screensaver/screensavers/attraction.xml.h
-capplets/screensaver/screensavers/blaster.xml.h
-capplets/screensaver/screensavers/blitspin.xml.h
-capplets/screensaver/screensavers/bouboule.xml.h
-capplets/screensaver/screensavers/braid.xml.h
-capplets/screensaver/screensavers/bsod.xml.h
-capplets/screensaver/screensavers/bubble3d.xml.h
-capplets/screensaver/screensavers/bubbles.xml.h
-capplets/screensaver/screensavers/bumps.xml.h
-capplets/screensaver/screensavers/cage.xml.h
-capplets/screensaver/screensavers/ccurve.xml.h
-capplets/screensaver/screensavers/compass.xml.h
-capplets/screensaver/screensavers/coral.xml.h
-capplets/screensaver/screensavers/cosmos.xml.h
-capplets/screensaver/screensavers/critical.xml.h
-capplets/screensaver/screensavers/crystal.xml.h
-capplets/screensaver/screensavers/cynosure.xml.h
-capplets/screensaver/screensavers/dangerball.xml.h
-capplets/screensaver/screensavers/decayscreen.xml.h
-capplets/screensaver/screensavers/deco.xml.h
-capplets/screensaver/screensavers/deluxe.xml.h
-capplets/screensaver/screensavers/demon.xml.h
-capplets/screensaver/screensavers/discrete.xml.h
-capplets/screensaver/screensavers/distort.xml.h
-capplets/screensaver/screensavers/drift.xml.h
-capplets/screensaver/screensavers/electricsheep.xml.h
-capplets/screensaver/screensavers/epicycle.xml.h
-capplets/screensaver/screensavers/extrusion.xml.h
-capplets/screensaver/screensavers/fadeplot.xml.h
-capplets/screensaver/screensavers/flag.xml.h
-capplets/screensaver/screensavers/flame.xml.h
-capplets/screensaver/screensavers/flow.xml.h
-capplets/screensaver/screensavers/forest.xml.h
-capplets/screensaver/screensavers/galaxy.xml.h
-capplets/screensaver/screensavers/gears.xml.h
-capplets/screensaver/screensavers/gflux.xml.h
-capplets/screensaver/screensavers/glplanet.xml.h
-capplets/screensaver/screensavers/gltext.xml.h
-capplets/screensaver/screensavers/goban.xml.h
-capplets/screensaver/screensavers/goop.xml.h
-capplets/screensaver/screensavers/grav.xml.h
-capplets/screensaver/screensavers/greynetic.xml.h
-capplets/screensaver/screensavers/halo.xml.h
-capplets/screensaver/screensavers/helix.xml.h
-capplets/screensaver/screensavers/hopalong.xml.h
-capplets/screensaver/screensavers/hyperball.xml.h
-capplets/screensaver/screensavers/hypercube.xml.h
-capplets/screensaver/screensavers/ifs.xml.h
-capplets/screensaver/screensavers/imsmap.xml.h
-capplets/screensaver/screensavers/interference.xml.h
-capplets/screensaver/screensavers/jigsaw.xml.h
-capplets/screensaver/screensavers/julia.xml.h
-capplets/screensaver/screensavers/kaleidescope.xml.h
-capplets/screensaver/screensavers/kumppa.xml.h
-capplets/screensaver/screensavers/lament.xml.h
-capplets/screensaver/screensavers/laser.xml.h
-capplets/screensaver/screensavers/lightning.xml.h
-capplets/screensaver/screensavers/lisa.xml.h
-capplets/screensaver/screensavers/lissie.xml.h
-capplets/screensaver/screensavers/lmorph.xml.h
-capplets/screensaver/screensavers/loop.xml.h
-capplets/screensaver/screensavers/maze.xml.h
-capplets/screensaver/screensavers/moebius.xml.h
-capplets/screensaver/screensavers/moire2.xml.h
-capplets/screensaver/screensavers/moire.xml.h
-capplets/screensaver/screensavers/molecule.xml.h
-capplets/screensaver/screensavers/morph3d.xml.h
-capplets/screensaver/screensavers/mountain.xml.h
-capplets/screensaver/screensavers/munch.xml.h
-capplets/screensaver/screensavers/nerverot.xml.h
-capplets/screensaver/screensavers/noseguy.xml.h
-capplets/screensaver/screensavers/pedal.xml.h
-capplets/screensaver/screensavers/penetrate.xml.h
-capplets/screensaver/screensavers/penrose.xml.h
-capplets/screensaver/screensavers/petri.xml.h
-capplets/screensaver/screensavers/phosphor.xml.h
-capplets/screensaver/screensavers/pipes.xml.h
-capplets/screensaver/screensavers/pulsar.xml.h
-capplets/screensaver/screensavers/pyro.xml.h
-capplets/screensaver/screensavers/qix.xml.h
-capplets/screensaver/screensavers/rd-bomb.xml.h
-capplets/screensaver/screensavers/ripples.xml.h
-capplets/screensaver/screensavers/rocks.xml.h
-capplets/screensaver/screensavers/rorschach.xml.h
-capplets/screensaver/screensavers/rotor.xml.h
-capplets/screensaver/screensavers/rotzoomer.xml.h
-capplets/screensaver/screensavers/rubiks_cube.xml.h
-capplets/screensaver/screensavers/rubik.xml.h
-capplets/screensaver/screensavers/shadebobs.xml.h
-capplets/screensaver/screensavers/sierpinski3d.xml.h
-capplets/screensaver/screensavers/sierpinski.xml.h
-capplets/screensaver/screensavers/slidescreen.xml.h
-capplets/screensaver/screensavers/slip.xml.h
-capplets/screensaver/screensavers/sonar.xml.h
-capplets/screensaver/screensavers/speedmine.xml.h
-capplets/screensaver/screensavers/sphere.xml.h
-capplets/screensaver/screensavers/spiral.xml.h
-capplets/screensaver/screensavers/spotlight.xml.h
-capplets/screensaver/screensavers/sproingies.xml.h
-capplets/screensaver/screensavers/squiral.xml.h
-capplets/screensaver/screensavers/ssystem.xml.h
-capplets/screensaver/screensavers/stairs.xml.h
-capplets/screensaver/screensavers/starfish.xml.h
-capplets/screensaver/screensavers/starwars.xml.h
-capplets/screensaver/screensavers/stonerview.xml.h
-capplets/screensaver/screensavers/strange.xml.h
-capplets/screensaver/screensavers/superquadrics.xml.h
-capplets/screensaver/screensavers/swirl.xml.h
-capplets/screensaver/screensavers/t3d.xml.h
-capplets/screensaver/screensavers/triangle.xml.h
-capplets/screensaver/screensavers/truchet.xml.h
-capplets/screensaver/screensavers/vidwhacker.xml.h
-capplets/screensaver/screensavers/vines.xml.h
-capplets/screensaver/screensavers/wander.xml.h
-capplets/screensaver/screensavers/webcollage.xml.h
-capplets/screensaver/screensavers/whirlwindwarp.xml.h
-capplets/screensaver/screensavers/whirlygig.xml.h
-capplets/screensaver/screensavers/worm.xml.h
-capplets/screensaver/screensavers/xaos.xml.h
-capplets/screensaver/screensavers/xdaliclock.xml.h
-capplets/screensaver/screensavers/xearth.xml.h
-capplets/screensaver/screensavers/xfishtank.xml.h
-capplets/screensaver/screensavers/xflame.xml.h
-capplets/screensaver/screensavers/xjack.xml.h
-capplets/screensaver/screensavers/xlyap.xml.h
-capplets/screensaver/screensavers/xmatrix.xml.h
-capplets/screensaver/screensavers/xmountains.xml.h
-capplets/screensaver/screensavers/xrayswarm.xml.h
-capplets/screensaver/screensavers/xroger.xml.h
-capplets/screensaver/screensavers/xsnow.xml.h
-capplets/screensaver/screensavers/xspirograph.xml.h
-capplets/screensaver/screensavers/xteevee.xml.h
-capplets/screensaver/screensavers/zoom.xml.h