--- gweather/Makefile.am.~1.25.~	Mon Jun 21 00:08:24 2004
+++ gweather/Makefile.am	Wed Jun 23 12:06:27 2004
@@ -48,7 +48,7 @@
 gweatherlocationsdir = $(datadir)/gweather
 gweatherlocations_in_files = Locations.xml.in
 gweatherlocations_DATA = $(gweatherlocations_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po-locations/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $@
 
 EXTRA_DIST = \
 	GNOME_GWeatherApplet_Factory.server.in.in \
diff -N -u old/po-locations/POTFILES.in po-locations/POTFILES.in
--- old/po-locations/POTFILES.in	Thu Jan  1 01:00:00 1970
+++ po-locations/POTFILES.in	Wed Jun 23 11:46:46 2004
@@ -0,0 +1,4 @@
+# This list should contain *only* gweather/Locations.xml.in.
+# Everything else should be in POTFILES.skip.
+[encoding:UTF-8]
+gweather/Locations.xml.in
diff -N -u old/po-locations/POTFILES.skip po-locations/POTFILES.skip
--- old/po-locations/POTFILES.skip	Thu Jan  1 01:00:00 1970
+++ po-locations/POTFILES.skip	Wed Jun 23 11:45:35 2004
@@ -0,0 +1,123 @@
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
+accessx-status/GNOME_AccessxApplet.xml
+accessx-status/GNOME_AccessxStatusApplet.server.in.in
+accessx-status/applet.c
+battstat/GNOME_BattstatApplet.server.in.in
+battstat/GNOME_BattstatApplet.xml
+battstat/battstat.schemas.in
+battstat/battstat_applet.c
+battstat/battstat_applet.glade
+battstat/properties.c
+battstat/sounds/battstat_applet.soundlist.in
+cdplayer/GNOME_CDPlayerApplet.server.in.in
+cdplayer/GNOME_CDPlayerApplet.xml
+cdplayer/cdplayer.c
+cdplayer/cdplayer.schemas.in
+charpick/GNOME_CharpickerApplet.server.in.in
+charpick/GNOME_CharpickerApplet.xml
+charpick/charpick.c
+charpick/charpick.schemas.in
+charpick/properties.c
+drivemount/GNOME_DriveMountApplet.server.in.in
+drivemount/GNOME_DriveMountApplet.xml
+drivemount/drivemount.c
+drivemount/drivemount.schemas.in
+drivemount/properties.c
+geyes/GNOME_GeyesApplet.server.in.in
+geyes/GNOME_GeyesApplet.xml
+geyes/geyes.c
+geyes/geyes.schemas.in
+geyes/themes.c
+gkb-new/GNOME_KeyboardApplet.xml
+gkb-new/GNOME_KeyboardApplet_Factory.server.in.in
+gkb-new/descs.sun/presets.xml.in
+gkb-new/descs/presets.xml.in
+gkb-new/gkb-applet.c
+gkb-new/gkb.c
+gkb-new/gkb.schemas.in
+gkb-new/gnome-keyboard-layout.c
+gkb-new/keygrab.c
+gkb-new/preset.c
+gkb-new/prop-add.c
+gkb-new/prop-list.c
+gkb-new/prop-map.c
+gkb-new/prop.c
+gkb-new/system.c
+gkb-new/util.c
+gswitchit/GNOME_GSwitchItApplet.xml
+gswitchit/GNOME_KeyboardApplet.server.in.in
+gswitchit/gswitchit-applet.c
+gswitchit/gswitchit-capplet.c
+gswitchit/gswitchit-plugins-add.c
+gswitchit/gswitchit-plugins.c
+gswitchit/gswitchit-plugins.glade
+gswitchit/gswitchit-properties.glade
+gswitchit/gswitchit.schemas.in
+gtik/GNOME_GtikApplet.server.in.in
+gtik/GNOME_GtikApplet.xml
+gtik/gtik.c
+gtik/gtik.schemas.in
+gweather/GNOME_GWeatherApplet.xml
+gweather/GNOME_GWeatherApplet_Factory.server.in.in
+gweather/gweather-about.c
+gweather/gweather-applet.c
+gweather/gweather-dialog.c
+gweather/gweather-pref.c
+gweather/gweather.schemas.in
+gweather/location.c
+gweather/main.c
+gweather/weather.c
+mailcheck/GNOME_MailCheckApplet.xml
+mailcheck/GNOME_MailcheckApplet_Factory.server.in.in
+mailcheck/mailcheck.c
+mailcheck/mailcheck.schemas.in
+mailcheck/mailcheck.soundlist.in
+mini-commander/src/GNOME_MiniCommanderApplet.server.in.in
+mini-commander/src/GNOME_MiniCommanderApplet.xml
+mini-commander/src/about.c
+mini-commander/src/cmd_completion.c
+mini-commander/src/command_line.c
+mini-commander/src/exec.c
+mini-commander/src/help.c
+mini-commander/src/history.c
+mini-commander/src/macro.c
+mini-commander/src/mc-install-default-macros.c
+mini-commander/src/mini-commander.glade
+mini-commander/src/mini-commander.schemas.in
+mini-commander/src/mini-commander_applet.c
+mini-commander/src/preferences.c
+mixer/GNOME_MixerApplet.server.in.in
+mixer/GNOME_MixerApplet.xml
+mixer/mixer.c
+mixer/mixer.schemas.in
+modemlights/GNOME_ModemLightsApplet.server.in.in
+modemlights/GNOME_ModemlightsApplet.xml
+modemlights/modemlights.c
+modemlights/modemlights.schemas.in
+modemlights/properties.c
+multiload/GNOME_MultiLoadApplet_Factory.server.in.in
+multiload/GNOME_MultiloadApplet.xml
+multiload/cpuload.c
+multiload/linux-proc.c
+multiload/load-graph.c
+multiload/loadavg.c
+multiload/main.c
+multiload/memload.c
+multiload/multiload.schemas.in
+multiload/netload.c
+multiload/properties.c
+multiload/swapload.c
+screen-exec/egg-screen-help.c
+stickynotes/GNOME_StickyNotesApplet.server.in.in
+stickynotes/GNOME_StickyNotesApplet.xml
+stickynotes/stickynotes.c
+stickynotes/stickynotes.glade
+stickynotes/stickynotes.schemas.in
+stickynotes/stickynotes_applet.c
+stickynotes/stickynotes_applet_callbacks.c
+stickynotes/stickynotes_callbacks.c
+wireless/GNOME_Panel_WirelessApplet.server.in.in
+wireless/GNOME_WirelessApplet.xml
+wireless/wireless-applet.c
+wireless/wireless-applet.glade
--- po/POTFILES.in.~1.71.~	Mon Jun 21 00:11:38 2004
+++ po/POTFILES.in	Wed Jun 23 11:42:01 2004
@@ -61,7 +61,6 @@
 gtik/gtik.schemas.in
 gweather/GNOME_GWeatherApplet.xml
 gweather/GNOME_GWeatherApplet_Factory.server.in.in
-gweather/Locations.xml.in
 gweather/gweather-about.c
 gweather/gweather-applet.c
 gweather/gweather-dialog.c
--- po/POTFILES.skip.~1.5.~	Wed Jul 16 21:58:41 2003
+++ po/POTFILES.skip	Wed Jun 23 11:41:58 2004
@@ -2,3 +2,4 @@
 # should NOT be translated.
 # Please keep this file sorted alphabetically.
 gweather/location.c
+gweather/Locations.xml.in
