Fix some strings

svn path=/trunk/; revision=13630

3 files changed, 382 insertions, 27 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index e08725a153..db4607bb8c 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-12  Iain Holmes  <iain@ximian.com>
+
+	* component-factory.c (component_factory_init): Fix message.
+
+	* metar.c: Fix some names.
+	Made the weather descriptions easier on the eyes.
+
 2001-10-11  Dan Winship  <danw@ximian.com>
 
 	* e-summary-mail.c (update_folder_cb): Update the signature to
diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c
index f2bd177298..f9bf42357b 100644
--- a/my-evolution/component-factory.c
+++ b/my-evolution/component-factory.c
@@ -151,7 +151,7 @@ component_factory_init (void)
 	result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (object));
 	if (result == OAF_REG_ERROR) {
 		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize Evolution's Executive Summary component."));
+			  _("Cannot initialize Evolution's Summary component."));
 		exit (1);
 	}
 }
diff --git a/my-evolution/metar.c b/my-evolution/metar.c
index 80f1ff0ab9..00b16518be 100644
--- a/my-evolution/metar.c
+++ b/my-evolution/metar.c
@@ -94,32 +94,380 @@ weather_wind_direction_string (Weather *w)
  * the below function so that new values are recognized
  */
 static const gchar *conditions_str[24][13] = {
-/*                   NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING                      */
-/*               *******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-/* NONE          */ {"",                          "",                                  "",                        "",                           "",                        "",                          "",                             "",                          "",                             "",                          "",                             "",                           "",                          },
-/* DRIZZLE       */ {N_("Drizzle"),               N_("Drizzle in the vicinity"),       N_("Light drizzle"),       N_("Moderate drizzle"),       N_("Heavy drizzle"),       N_("Shallow drizzle"),       N_("Patches of drizzle"),       N_("Partial drizzle"),       N_("Thunderstorm"),             N_("Windy drizzle"),         N_("Showers"),                  N_("Drifting drizzle"),       N_("Freezing drizzle")       },
-/* RAIN          */ {N_("Rain"),                  N_("Rain in the vicinity") ,         N_("Light rain"),          N_("Moderate rain"),          N_("Heavy rain"),          N_("Shallow rain"),          N_("Patches of rain"),          N_("Partial rainfall"),      N_("Thunderstorm"),             N_("Blowing rainfall"),      N_("Rain showers"),             N_("Drifting rain"),          N_("Freezing rain")          },
-/* SNOW          */ {N_("Snow"),                  N_("Snow in the vicinity") ,         N_("Light snow"),          N_("Moderate snow"),          N_("Heavy snow"),          N_("Shallow snow"),          N_("Patches of snow"),          N_("Partial snowfall"),      N_("Snowstorm"),                N_("Blowing snowfall"),      N_("Snow showers"),             N_("Drifting snow"),          N_("Freezing snow")          },
-/* SNOW_GRAINS   */ {N_("Snow grains"),           N_("Snow grains in the vicinity") ,  N_("Light snow grains"),   N_("Moderate snow grains"),   N_("Heavy snow grains"),   N_("Shallow snow grains"),   N_("Patches of snow grains"),   N_("Partial snow grains"),   N_("Snowstorm"),                N_("Blowing snow grains"),   N_("Snow grain showers"),       N_("Drifting snow grains"),   N_("Freezing snow grains")   },
-/* ICE_CRYSTALS  */ {N_("Ice crystals"),          N_("Ice crystals in the vicinity") , N_("Few ice crystals"),    N_("Moderate ice crystals"),  N_("Heavy ice crystals"),  "??",                        N_("Patches of ice crystals"),  N_("Partial ice crystals"),  N_("Ice crystal storm"),        N_("Blowing ice crystals"),  N_("Showers of ice crystals"),  N_("Drifting ice crystals"),  N_("Freezing ice crystals")  },
-/* ICE_PELLETS   */ {N_("Ice pellets"),           N_("Ice pellets in the vicinity") ,  N_("Few ice pellets"),     N_("Moderate ice pellets"),   N_("Heavy ice pellets"),   N_("Shallow ice pellets"),   N_("Patches of ice pellets"),   N_("Partial ice pellets"),   N_("Ice pellet storm"),         N_("Blowing ice pellets"),   N_("Showers of ice pellets"),   N_("Drifting ice pellets"),   N_("Freezing ice pellets")   },
-/* HAIL          */ {N_("Hail"),                  N_("Hail in the vicinity") ,         N_("Light hail"),          N_("Moderate hail"),          N_("Heavy hail"),          N_("Shallow hail"),          N_("Patches of hail"),          N_("Partial hail"),          N_("Hailstorm"),                N_("Blowing hail"),          N_("Hail showers"),             N_("Drifting hail"),          N_("Freezing hail")          },
-/* SMALL_HAIL    */ {N_("Small hail"),            N_("Small hail in the vicinity") ,   N_("Light hail"),          N_("Moderate small hail"),    N_("Heavy small hail"),    N_("Shallow small hail"),    N_("Patches of small hail"),    N_("Partial small hail"),    N_("Small hailstorm"),          N_("Blowing small hail"),    N_("Showers of small hail"),    N_("Drifting small hail"),    N_("Freezing small hail")    },
-/* PRECIPITATION */ {N_("Unknown precipitation"), N_("Precipitation in the vicinity"), N_("Light precipitation"), N_("Moderate precipitation"), N_("Heavy precipitation"), N_("Shallow precipitation"), N_("Patches of precipitation"), N_("Partial precipitation"), N_("Unknown thunderstorm"),     N_("Blowing precipitation"), N_("Showers, type unknown"),    N_("Drifting precipitation"), N_("Freezing precipitation") },
-/* MIST          */ {N_("Mist"),                  N_("Mist in the vicinity") ,         N_("Light mist"),          N_("Moderate mist"),          N_("Thick mist"),          N_("Shallow mist"),          N_("Patches of mist"),          N_("Partial mist"),          "??",                           N_("Mist with wind"),        "??",                           N_("Drifting mist"),          N_("Freezing mist")          },
-/* FOG           */ {N_("Fog"),                   N_("Fog in the vicinity") ,          N_("Light fog"),           N_("Moderate fog"),           N_("Thick fog"),           N_("Shallow fog"),           N_("Patches of fog"),           N_("Partial fog"),           "??",                           N_("Fog with wind"),         "??",                           N_("Drifting fog"),           N_("Freezing fog")           },
-/* SMOKE         */ {N_("Smoke"),                 N_("Smoke in the vicinity") ,        N_("Thin smoke"),          N_("Moderate smoke"),         N_("Thick smoke"),         N_("Shallow smoke"),         N_("Patches of smoke"),         N_("Partial smoke"),         N_("Smoke w/ thunders"),        N_("Smoke with wind"),       "??",                           N_("Drifting smoke"),         "??"                         },
-/* VOLCANIC_ASH  */ {N_("Volcanic ash"),          N_("Volcanic ash in the vicinity") , "??",                      N_("Moderate volcanic ash"),  N_("Thick volcanic ash"),  N_("Shallow volcanic ash"),  N_("Patches of volcanic ash"),  N_("Partial volcanic ash"),  N_("Volcanic ash w/ thunders"), N_("Blowing volcanic ash"),  N_("Showers of volcanic ash "), N_("Drifting volcanic ash"),  N_("Freezing volcanic ash")  },
-/* SAND          */ {N_("Sand"),                  N_("Sand in the vicinity") ,         N_("Light sand"),          N_("Moderate sand"),          N_("Heavy sand"),          "??",                        N_("Patches of sand"),          N_("Partial sand"),          "??",                           N_("Blowing sand"),          "",                             N_("Drifting sand"),          "??"                         },
-/* HAZE          */ {N_("Haze"),                  N_("Haze in the vicinity") ,         N_("Light haze"),          N_("Moderate haze"),          N_("Thick haze"),          N_("Shallow haze"),          N_("Patches of haze"),          N_("Partial haze"),          "??",                           N_("Haze with wind"),        "??",                           N_("Drifting haze"),          N_("Freezing haze")          },
-/* SPRAY         */ {N_("Sprays"),                N_("Sprays in the vicinity") ,       N_("Light sprays"),        N_("Moderate sprays"),        N_("Heavy sprays"),        N_("Shallow sprays"),        N_("Patches of sprays"),        N_("Partial sprays"),        "??",                           N_("Blowing sprays"),        "??",                           N_("Drifting sprays"),        N_("Freezing sprays")        },
-/* DUST          */ {N_("Dust"),                  N_("Dust in the vicinity") ,         N_("Light dust"),          N_("Moderate dust"),          N_("Heavy dust"),          "??",                        N_("Patches of dust"),          N_("Partial dust"),          "??",                           N_("Blowing dust"),          "??",                           N_("Drifting dust"),          "??"                         },
-/* SQUALL        */ {N_("Squall"),                N_("Squall in the vicinity") ,       N_("Light squall"),        N_("Moderate squall"),        N_("Heavy squall"),        "??",                        "??",                           N_("Partial squall"),        N_("Thunderous squall"),        N_("Blowing squall"),        "??",                           N_("Drifting squall"),        N_("Freezing squall")        },
-/* SANDSTORM     */ {N_("Sandstorm"),             N_("Sandstorm in the vicinity") ,    N_("Light standstorm"),    N_("Moderate sandstorm"),     N_("Heavy sandstorm"),     N_("Shallow sandstorm"),     "??",                           N_("Partial sandstorm"),     N_("Thunderous sandstorm"),     N_("Blowing sandstorm"),     "??",                           N_("Drifting sandstorm"),     N_("Freezing sandstorm")     },
-/* DUSTSTORM     */ {N_("Duststorm"),             N_("Duststorm in the vicinity") ,    N_("Light duststorm"),     N_("Moderate duststorm"),     N_("Heavy duststorm"),     N_("Shallow duststorm"),     "??",                           N_("Partial duststorm"),     N_("Thunderous duststorm"),     N_("Blowing duststorm"),     "??",                           N_("Drifting duststorm"),     N_("Freezing duststorm")     },
-/* FUNNEL_CLOUD  */ {N_("Funnel cloud"),          N_("Funnel cloud in the vicinity") , N_("Light funnel cloud"),  N_("Moderate funnel cloud"),  N_("Thick funnel cloud"),  N_("Shallow funnel cloud"),  N_("Patches of funnel clouds"), N_("Partial funnel clouds"), "??",                           N_("Funnel cloud w/ wind"),  "??",                           N_("Drifting funnel cloud"),  "??"                         },
-/* TORNADO       */ {N_("Tornado"),               N_("Tornado in the vicinity") ,      "??",                      N_("Moderate tornado"),       N_("Raging tornado"),      "??",                        "??",                           N_("Partial tornado"),       N_("Thunderous tornado"),       N_("Tornado"),               "??",                           N_("Drifting tornado"),       N_("Freezing tornado")       },
-/* DUST_WHIRLS   */ {N_("Dust whirls"),           N_("Dust whirls in the vicinity") ,  N_("Light dust whirls"),   N_("Moderate dust whirls"),   N_("Heavy dust whirls"),   N_("Shallow dust whirls"),   N_("Patches of dust whirls"),   N_("Partial dust whirls"),   "??",                           N_("Blowing dust whirls"),   "??",                           N_("Drifting dust whirls"),   "??"                         }
+/* NONE              
+   VICINITY 
+   LIGHT 
+   MODERATE  
+   HEAVY   
+   SHALLOW   
+   PATCHES     
+   PARTIAL  
+   THUNDERSTORM  
+   BLOWING  
+   SHOWERS 
+   DRIFTING 
+   FREEZING              
+*/
+/* NONE */ {
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",                         
+},
+/* DRIZZLE */ {
+	N_("Drizzle"),
+	N_("Drizzle in the vicinity"), 
+	N_("Light drizzle"),
+	N_("Moderate drizzle"), 
+	N_("Heavy drizzle"),
+	N_("Shallow drizzle"),
+	N_("Patches of drizzle"),
+	N_("Partial drizzle"), 
+	N_("Thunderstorm"),
+	N_("Windy drizzle"), 
+        N_("Showers"),
+	N_("Drifting drizzle"), 
+	N_("Freezing drizzle")    
+},
+/* RAIN */ {
+	N_("Rain"),
+	N_("Rain in the vicinity"),
+	N_("Light rain"),
+	N_("Moderate rain"),
+	N_("Heavy rain"),
+	N_("Shallow rain"),
+	N_("Patches of rain"),
+	N_("Partial rainfall"),
+	N_("Thunderstorm"),
+	N_("Blowing rainfall"),
+	N_("Rain showers"),
+	N_("Drifting rain"),
+	N_("Freezing rain")   
+},
+/* SNOW */ {
+	N_("Snow"),
+	N_("Snow in the vicinity"),
+	N_("Light snow"),
+	N_("Moderate snow"), 
+	N_("Heavy snow"), 
+	N_("Shallow snow"), 
+	N_("Patches of snow"),  
+        N_("Partial snowfall"), 
+	N_("Snowstorm"),
+	N_("Blowing snowfall"), 
+	N_("Snow showers"), 
+	N_("Drifting snow"), 
+	N_("Freezing snow")
+},
+/* SNOW_GRAINS */ {
+	N_("Snow grains"), 
+	N_("Snow grains in the vicinity"), 
+	N_("Light snow grains"),  
+	N_("Moderate snow grains"),
+	N_("Heavy snow grains"), 
+	N_("Shallow snow grains"),
+	N_("Patches of snow grains"),
+	N_("Partial snow grains"),  
+	N_("Snowstorm"),  
+	N_("Blowing snow grains"), 
+	N_("Snow grain showers"), 
+	N_("Drifting snow grains"),
+	N_("Freezing snow grains") 
+},
+/* ICE_CRYSTALS */ {
+	N_("Ice crystals"),
+	N_("Ice crystals in the vicinity"),
+	N_("Few ice crystals"), 
+	N_("Moderate ice crystals"), 
+	N_("Heavy ice crystals"), 
+	"??", 
+	N_("Patches of ice crystals"),
+	N_("Partial ice crystals"),
+	N_("Ice crystal storm"),  
+	N_("Blowing ice crystals"), 
+	N_("Showers of ice crystals"),
+	N_("Drifting ice crystals"),
+	N_("Freezing ice crystals")
+},
+/* ICE_PELLETS */ {
+	N_("Ice pellets"),
+	N_("Ice pellets in the vicinity"),
+	N_("Few ice pellets"),  
+	N_("Moderate ice pellets"),
+	N_("Heavy ice pellets"),
+	N_("Shallow ice pellets"), 
+	N_("Patches of ice pellets"),
+	N_("Partial ice pellets"), 
+	N_("Ice pellet storm"),  
+	N_("Blowing ice pellets"), 
+	N_("Showers of ice pellets"),  
+	N_("Drifting ice pellets"), 
+	N_("Freezing ice pellets")
+},
+/* HAIL */ {
+	N_("Hail"),  
+	N_("Hail in the vicinity"), 
+        N_("Light hail"),
+	N_("Moderate hail"),
+	N_("Heavy hail"),  
+        N_("Shallow hail"),
+	N_("Patches of hail"),   
+	N_("Partial hail"),  
+        N_("Hailstorm"),  
+	N_("Blowing hail"),  
+        N_("Hail showers"),   
+	N_("Drifting hail"),
+	N_("Freezing hail")   
+},
+/* SMALL_HAIL */ {
+	N_("Small hail"), 
+	N_("Small hail in the vicinity"),
+	N_("Light hail"),    
+	N_("Moderate small hail"), 
+	N_("Heavy small hail"), 
+	N_("Shallow small hail"), 
+	N_("Patches of small hail"),   
+	N_("Partial small hail"),  
+	N_("Small hailstorm"),   
+	N_("Blowing small hail"), 
+	N_("Showers of small hail"),   
+	N_("Drifting small hail"),
+	N_("Freezing small hail") 
+},
+/* PRECIPITATION */ {
+	N_("Unknown precipitation"),
+	N_("Precipitation in the vicinity"),
+	N_("Light precipitation"),
+	N_("Moderate precipitation"),
+	N_("Heavy precipitation"),
+	N_("Shallow precipitation"),
+	N_("Patches of precipitation"),
+	N_("Partial precipitation"),
+	N_("Unknown thunderstorm"), 
+	N_("Blowing precipitation"),
+	N_("Showers, type unknown"),  
+	N_("Drifting precipitation"),
+	N_("Freezing precipitation")
+},
+/* MIST */ {
+	N_("Mist"),  
+	N_("Mist in the vicinity"),  
+	N_("Light mist"),  
+        N_("Moderate mist"),
+	N_("Thick mist"),  
+        N_("Shallow mist"), 
+	N_("Patches of mist"),   
+	N_("Partial mist"),  
+        "??",   
+	N_("Mist with wind"),   
+	"??", 
+	N_("Drifting mist"), 
+	N_("Freezing mist")  
+},
+/* FOG */ {
+	N_("Fog"), 
+	N_("Fog in the vicinity"),  
+        N_("Light fog"),  
+	N_("Moderate fog"), 
+	N_("Thick fog"), 
+	N_("Shallow fog"),  
+	N_("Patches of fog"),  
+	N_("Partial fog"),  
+	"??", 
+	N_("Fog with wind"),  
+	"??",   
+	N_("Drifting fog"),  
+	N_("Freezing fog")  
+},
+/* SMOKE */ {
+	N_("Smoke"),  
+	N_("Smoke in the vicinity"),
+        N_("Thin smoke"),   
+	N_("Moderate smoke"),
+	N_("Thick smoke"), 
+        N_("Shallow smoke"),
+	N_("Patches of smoke"), 
+        N_("Partial smoke"), 
+        N_("Thunderous smoke"), 
+	N_("Smoke with wind"),
+	"??",   
+	N_("Drifting smoke"),  
+	"??"    
+},
+/* VOLCANIC_ASH */ {
+	N_("Volcanic ash"),  
+        N_("Volcanic ash in the vicinity"),
+	"??",  
+	N_("Moderate volcanic ash"), 
+	N_("Thick volcanic ash"),
+	N_("Shallow volcanic ash"),
+	N_("Patches of volcanic ash"),
+	N_("Partial volcanic ash"), 
+	N_("Thunderous volcanic ash"),
+	N_("Blowing volcanic ash"),
+	N_("Showers of volcanic ash"),
+	N_("Drifting volcanic ash"), 
+	N_("Freezing volcanic ash")
+},
+/* SAND */ {
+	N_("Sand"), 
+	N_("Sand in the vicinity"),
+	N_("Light sand"),
+	N_("Moderate sand"),
+	N_("Heavy sand"),  
+        "??",  
+	N_("Patches of sand"),   
+	N_("Partial sand"),  
+        "??",  
+	N_("Blowing sand"),   
+	"",      
+	N_("Drifting sand"),  
+        "??" 
+},
+/* HAZE */ {
+	N_("Haze"), 
+	N_("Haze in the vicinity"), 
+        N_("Light haze"),   
+	N_("Moderate haze"), 
+	N_("Thick haze"),  
+        N_("Shallow haze"), 
+	N_("Patches of haze"),  
+        N_("Partial haze"),  
+        "??",     
+	N_("Haze with wind"),  
+	"??",   
+	N_("Drifting haze"),  
+        N_("Freezing haze")
+},
+/* SPRAY */ {
+	N_("Spray"),
+	N_("Spray in the vicinity"),
+	N_("Light spray"),  
+	N_("Moderate spray"),  
+	N_("Heavy spray"), 
+	N_("Shallow spray"), 
+	N_("Patches of spray"),   
+	N_("Partial spray"),   
+	"??",    
+	N_("Blowing spray"),   
+	"??",    
+	N_("Drifting spray"),  
+	N_("Freezing spray")  
+},
+/* DUST */ {
+	N_("Dust"),  
+	N_("Dust in the vicinity"),  
+	N_("Light dust"),      
+	N_("Moderate dust"),   
+	N_("Heavy dust"),  
+        "??",   
+	N_("Patches of dust"),   
+	N_("Partial dust"),   
+	"??",   
+	N_("Blowing dust"),   
+	"??",   
+	N_("Drifting dust"),  
+        "??"     
+},
+/* SQUALL */ {
+	N_("Squall"), 
+	N_("Squall in the vicinity"), 
+	N_("Light squall"), 
+	N_("Moderate squall"), 
+	N_("Heavy squall"), 
+	"??",  
+	"??",  
+	N_("Partial squall"),  
+	N_("Thunderous squall"), 
+	N_("Blowing squall"),  
+	"??",   
+	N_("Drifting squall"),  
+	N_("Freezing squall")  
+},
+/* SANDSTORM */ {
+	N_("Sandstorm"),  
+	N_("Sandstorm in the vicinity"), 
+	N_("Light standstorm"), 
+	N_("Moderate sandstorm"),  
+	N_("Heavy sandstorm"), 
+	N_("Shallow sandstorm"), 
+	"??",    
+	N_("Partial sandstorm"),  
+	N_("Thunderous sandstorm"),  
+	N_("Blowing sandstorm"), 
+	"??",   
+	N_("Drifting sandstorm"),   
+	N_("Freezing sandstorm")   
+},
+/* DUSTSTORM */ {
+	N_("Duststorm"), 
+	N_("Duststorm in the vicinity"), 
+	N_("Light duststorm"),  
+	N_("Moderate duststorm"),  
+	N_("Heavy duststorm"),
+	N_("Shallow duststorm"),  
+	"??",    
+	N_("Partial duststorm"),  
+	N_("Thunderous duststorm"), 
+	N_("Blowing duststorm"),   
+	"??",   
+	N_("Drifting duststorm"), 
+	N_("Freezing duststorm")  
+},
+/* FUNNEL_CLOUD */ {
+	N_("Funnel cloud"),  
+        N_("Funnel cloud in the vicinity"),
+	N_("Light funnel cloud"), 
+	N_("Moderate funnel cloud"), 
+	N_("Thick funnel cloud"), 
+	N_("Shallow funnel cloud"), 
+	N_("Patches of funnel clouds"),
+	N_("Partial funnel clouds"),
+	"??",  
+	N_("Funnel cloud w/ wind"), 
+	"??",   
+	N_("Drifting funnel cloud"),  
+	"??"  
+},
+/* TORNADO */ {
+	N_("Tornado"),   
+	N_("Tornado in the vicinity"), 
+	"??",  
+	N_("Moderate tornado"), 
+	N_("Raging tornado"), 
+	"??",  
+	"??",   
+	N_("Partial tornado"),  
+	N_("Thunderous tornado"),  
+	N_("Tornado"),
+	"??",  
+	N_("Drifting tornado"),  
+	N_("Freezing tornado") 
+},
+/* DUST_WHIRLS */ {
+	N_("Dust whirls"),   
+        N_("Dust whirls in the vicinity"), 
+	N_("Light dust whirls"),
+	N_("Moderate dust whirls"),  
+	N_("Heavy dust whirls"),
+	N_("Shallow dust whirls"), 
+	N_("Patches of dust whirls"),
+	N_("Partial dust whirls"), 
+	"??",  
+	N_("Blowing dust whirls"),  
+	"??",    
+	N_("Drifting dust whirls"),  
+	"??"   
+}
 };
 
 const char *