[GRASS-SVN] r38068 - in grass/trunk: gui/wxpython imagery/i.eb.evapfr raster/r.li/r.li.dominance raster/r.li/r.li.richness raster/r.li/r.li.shannon raster/r.li/r.li.simpson vector/v.generalize

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-06-24 17:14:16 -0400 (Wed, 24 Jun 2009)
New Revision: 38068

Modified:
   grass/trunk/gui/wxpython/wxgui.py
   grass/trunk/imagery/i.eb.evapfr/main.c
   grass/trunk/raster/r.li/r.li.dominance/dominance.c
   grass/trunk/raster/r.li/r.li.richness/richness.c
   grass/trunk/raster/r.li/r.li.shannon/shannon.c
   grass/trunk/raster/r.li/r.li.simpson/simpson.c
   grass/trunk/vector/v.generalize/main.c
Log:
fix wrongly assigned keywords


Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2009-06-24 19:35:15 UTC (rev 38067)
+++ grass/trunk/gui/wxpython/wxgui.py	2009-06-24 21:14:16 UTC (rev 38068)
@@ -606,9 +606,9 @@
         try:
             gxwXml = workspace.ProcessWorkspaceFile(etree.parse(filename))
         except Exception, err:
-            raise gcmd.GStdError(_("Reading workspace file <%s> failed.\n"
+            raise gcmd.GStdError(_("Reading workspace file <%(file)s> failed.\n"
                                    "Invalid file, unable to parse XML document."
-                                   "\n\n%s") % (filename, err),
+                                   "\n\n%(err)s") % { 'file' : filename, 'err': err},
                                  parent = self)
         
         busy = wx.BusyInfo(message=_("Please wait, loading workspace..."),

Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c	2009-06-24 19:35:15 UTC (rev 38067)
+++ grass/trunk/imagery/i.eb.evapfr/main.c	2009-06-24 21:14:16 UTC (rev 38068)
@@ -46,8 +46,11 @@
     /************************************/ 
     G_gisinit(argv[0]);
     module = G_define_module();
-    G_add_keyword(_(""));
-	_("imagery, evaporative fraction, soil moisture, energy balance, SEBAL");
+    G_add_keyword(_("imagery"));
+    G_add_keyword(_("evaporative fraction"));
+    G_add_keyword(_("soil moisture"));
+    G_add_keyword(_("energy balance"));
+    G_add_keyword(_("SEBAL"));
     module->description =
 	_("Computes evaporative fraction (Bastiaanssen, 1995) and "
 	  "root zone soil moisture (Makin, Molden and Bastiaanssen, 2001)");

Modified: grass/trunk/raster/r.li/r.li.dominance/dominance.c
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/dominance.c	2009-06-24 19:35:15 UTC (rev 38067)
+++ grass/trunk/raster/r.li/r.li.dominance/dominance.c	2009-06-24 21:14:16 UTC (rev 38068)
@@ -40,8 +40,9 @@
     module = G_define_module();
     module->description =
 	_("Calculates dominance's diversity index on a raster map");
-    G_add_keyword(_(""));
-	_("raster, landscape structure analysis, diversity index");
+    G_add_keyword(_("raster"));
+    G_add_keyword(_("landscape structure analysis"));
+    G_add_keyword(_("diversity index"));
 
     /* define options */
 

Modified: grass/trunk/raster/r.li/r.li.richness/richness.c
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/richness.c	2009-06-24 19:35:15 UTC (rev 38067)
+++ grass/trunk/raster/r.li/r.li.richness/richness.c	2009-06-24 21:14:16 UTC (rev 38068)
@@ -38,8 +38,9 @@
     module = G_define_module();
     module->description =
 	_("Calculates dominance's diversity index on a raster map");
-    G_add_keyword(_(""));
-	_("raster, landscape structure analysis, dominance index");
+    G_add_keyword(_("raster"));
+    G_add_keyword(_("landscape structure analysis"));
+    G_add_keyword(_("dominance index"));
 
     /* define options */
 

Modified: grass/trunk/raster/r.li/r.li.shannon/shannon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/shannon.c	2009-06-24 19:35:15 UTC (rev 38067)
+++ grass/trunk/raster/r.li/r.li.shannon/shannon.c	2009-06-24 21:14:16 UTC (rev 38068)
@@ -37,8 +37,9 @@
     module = G_define_module();
     module->description =
 	_("Calculates Shannon's diversity index on a raster map");
-    G_add_keyword(_(""));
-	_("raster, landscape structure analysis, diversity index");
+    G_add_keyword(_("raster"));
+    G_add_keyword(_("landscape structure analysis"));
+    G_add_keyword(_("diversity index"));
 
     /* define options */
 

Modified: grass/trunk/raster/r.li/r.li.simpson/simpson.c
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/simpson.c	2009-06-24 19:35:15 UTC (rev 38067)
+++ grass/trunk/raster/r.li/r.li.simpson/simpson.c	2009-06-24 21:14:16 UTC (rev 38068)
@@ -38,8 +38,9 @@
     module = G_define_module();
     module->description =
 	_("Calculates Simpson's diversity index on a raster map");
-    G_add_keyword(_(""));
-	_("raster, landscape structure analysis, diversity index");
+    G_add_keyword(_("raster"));
+    G_add_keyword(_("landscape structure analysis"));
+    G_add_keyword(_("diversity index"));
 
     /* define options */
 

Modified: grass/trunk/vector/v.generalize/main.c
===================================================================
--- grass/trunk/vector/v.generalize/main.c	2009-06-24 19:35:15 UTC (rev 38067)
+++ grass/trunk/vector/v.generalize/main.c	2009-06-24 21:14:16 UTC (rev 38068)
@@ -75,8 +75,12 @@
 
     /* initialize module */
     module = G_define_module();
-    G_add_keyword(_(""));
-	_("vector, generalization, simplification, smoothing, displacement, network generalization");
+    G_add_keyword(_("vector"));
+    G_add_keyword(_("generalization"));
+    G_add_keyword(_("simplification"));
+    G_add_keyword(_("smoothing"));
+    G_add_keyword(_("displacement"));
+    G_add_keyword(_("network generalization"));
     module->description = _("Vector based generalization.");
 
     /* Define the different options as defined in gis.h */