Преглед изворни кода

fix wrongly assigned keywords

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38068 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa пре 16 година
родитељ
комит
45f7b423bc

+ 2 - 2
gui/wxpython/wxgui.py

@@ -606,9 +606,9 @@ class GMFrame(wx.Frame):
         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..."),

+ 5 - 2
imagery/i.eb.evapfr/main.c

@@ -46,8 +46,11 @@ int main(int argc, char *argv[])
     /************************************/ 
     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)");

+ 3 - 2
raster/r.li/r.li.dominance/dominance.c

@@ -40,8 +40,9 @@ int main(int argc, char *argv[])
     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 */
 

+ 3 - 2
raster/r.li/r.li.richness/richness.c

@@ -38,8 +38,9 @@ int main(int argc, char *argv[])
     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 */
 

+ 3 - 2
raster/r.li/r.li.shannon/shannon.c

@@ -37,8 +37,9 @@ int main(int argc, char *argv[])
     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 */
 

+ 3 - 2
raster/r.li/r.li.simpson/simpson.c

@@ -38,8 +38,9 @@ int main(int argc, char *argv[])
     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 */
 

+ 6 - 2
vector/v.generalize/main.c

@@ -75,8 +75,12 @@ int main(int argc, char *argv[])
 
     /* 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 */