Index: gweather.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-applets/gweather/gweather.schemas.in,v
retrieving revision 1.3
diff -p -u -u -r1.3 gweather.schemas.in
--- gweather.schemas.in	25 Jul 2003 01:28:54 -0000	1.3
+++ gweather.schemas.in	27 Apr 2004 03:55:44 -0000
@@ -54,8 +54,8 @@
 	<key>/schemas/apps/gweather/prefs/location0</key>
 	<owner>gweather-applet-2</owner>
 	<type>string</type>
-	<default>Pittsburgh</default>
 	<locale name="C">
+		<default>DEFAULT_LOCATION</default>
 		<short>weather location information.</short>
 		<long>weather location information.</long>
 	</locale>
@@ -64,8 +64,8 @@
 	<key>/schemas/apps/gweather/prefs/location1</key>
 	<owner>gweather-applet-2</owner>
 	<type>string</type>
-	<default>KPIT</default>
 	<locale name="C">
+		<default>DEFAULT_CODE</default>
 		<short>weather location information.</short>
 		<long>weather location information.</long>
 	</locale>
@@ -74,8 +74,8 @@
 	<key>/schemas/apps/gweather/prefs/location2</key>
 	<owner>gweather-applet-2</owner>
 	<type>string</type>
-	<default>PAZ021</default>
 	<locale name="C">
+		<default>DEFAULT_ZONE</default>
 		<short>weather location information.</short>
 		<long>weather location information.</long>
 	</locale>
@@ -84,8 +84,8 @@
 	<key>/schemas/apps/gweather/prefs/location3</key>
 	<owner>gweather-applet-2</owner>
 	<type>string</type>
-	<default>pit</default>
 	<locale name="C">
+		<default>DEFAULT_RADAR</default>
 		<short>weather location information.</short>
 		<long>weather location information.</long>
 	</locale>
Index: weather.c
===================================================================
RCS file: /cvs/gnome/gnome-applets/gweather/weather.c,v
retrieving revision 1.74
diff -p -u -u -r1.74 weather.c
--- weather.c	10 Mar 2004 22:29:30 -0000	1.74
+++ weather.c	27 Apr 2004 03:55:44 -0000
@@ -86,18 +86,68 @@ WeatherLocation *weather_location_config
     gchar *name, *code, *zone, *radar;
     
     name = panel_applet_gconf_get_string(applet, "location0", NULL);
-    if (!name)
-    	name = g_strdup ("Pittsburgh");
+    if (!name) {
+        if ( g_strstr_len ("DEFAULT_LOCATION", 16, _("DEFAULT_LOCATION")) == NULL ) {
+            /* TRANSLATOR: Change this to the default location name (1st parameter) in the */
+            /* gweather/Locations file */
+            /* For example for New York (JFK) the entry is loc14=New\\ York-JFK\\ Arpt KJFK NYZ076 nyc */
+            /* so this should be translated as "New York-JFK Arpt" */
+            name = g_strdup ( _("DEFAULT_LOCATION") );
+		} else {
+    	    name = g_strdup ("Pittsburgh");
+        }
+    } else if ( g_strstr_len ("DEFAULT_LOCATION", 16, name) ) {
+        g_free ( name );
+		name = g_strdup ("Pittsburgh");
+    }
+
     code = panel_applet_gconf_get_string(applet, "location1", NULL);
-    if (!code)
-    	code = g_strdup ("KPIT");
+    if (!code) { 
+        if (g_strstr_len ("DEFAULT_CODE", 12, _("DEFAULT_CODE")) == NULL) {
+            /* TRANSLATOR: Change this to the default location code (2nd parameter) in the */
+            /* gweather/Locations file */
+            /* For example for New York (JFK) the entry is loc14=New\\ York-JFK\\ Arpt KJFK NYZ076 nyc */
+            /* so this should be translated as "KJFK" */
+            code = g_strdup ( _("DEFAULT_CODE") );
+        } else {
+    	    code = g_strdup ("KPIT");
+        }
+    } else if ( g_strstr_len ("DEFAULT_CODE", 12, code) ) {
+        g_free (code);
+        code = g_strdup ("KPIT");
+    }
+	
     zone = panel_applet_gconf_get_string(applet, "location2", NULL);
-    if (!zone)
-    	zone = g_strdup ("PAZ021");
+    if (!zone) {
+        if (g_strstr_len("DEFAULT_ZONE", 12, _("DEFAULT_ZONE")) == NULL) {
+            /* TRANSLATOR: Change this to the default location zone (3rd parameter) in the */
+            /* gweather/Locations file */
+            /* For example for New York (JFK) the entry is loc14=New\\ York-JFK\\ Arpt KJFK NYZ076 nyc */
+            /* so this should be translated as "NYZ076" */
+            zone = g_strdup ( _("DEFAULT_ZONE" ) );
+        } else {
+            zone = g_strdup ("PAZ021");
+        }
+    } else if ( g_strstr_len ("DEFAULT_ZONE", 12, code) ) {
+        g_free (zone);
+		zone = g_strdup ("PAZ021");
+    }
     radar = panel_applet_gconf_get_string(applet, "location3", NULL);
-    if (!radar)
+    if (!radar) {
+        if (g_strstr_len("DEFAULT_RADAR", 13, N_("DEFAULT_RADAR")) == NULL) {
+            /* Translators: Change this to the default location radar (4th parameter) in the */
+            /* gweather/Locations file */
+            /* For example for New York (JFK) the entry is loc14=New\\ York-JFK\\ Arpt KJFK NYZ076 nyc */
+            /* so this should be translated as "nyc" */
+			radar = g_strdup ( _("DEFAULT_RADAR") );
+        } else {
+            radar = g_strdup ("pit");
+        }
+    } else if ( g_strstr_len ("DEFAULT_RADAR", 13, radar) ) {
+        g_free (radar);
         radar = g_strdup ("pit");
-        
+    }
+
     location = weather_location_new(name, code, zone, radar);
     g_free (name);
     g_free (code);
@@ -2251,6 +2301,3 @@ void _weather_info_get_pixbuf (WeatherIn
 
     *pixbuf = pixbufs[idx];
 }
-
-
-
