Wed Aug 22 12:17:25 PDT 2012

Author: neteler
Date: 2012-08-22 12:17:24 -0700 (Wed, 22 Aug 2012)
New Revision: 52838

Modified:
   grass/trunk/display/d.colorlist/main.c
   grass/trunk/display/d.font/main.c
   grass/trunk/display/d.fontlist/main.c
   grass/trunk/imagery/i.pca/main.c
   grass/trunk/ps/ps.map/main.c
   grass/trunk/raster/r.random.cells/main.c
   grass/trunk/raster/r.random.surface/main.c
   grass/trunk/raster/r.random/main.c
   grass/trunk/raster3d/r3.out.netcdf/main.c
   grass/trunk/raster3d/r3.retile/main.c
   grass/trunk/scripts/v.dissolve/v.dissolve.py
   grass/trunk/scripts/v.in.sites.all/v.in.sites.all.py
   grass/trunk/scripts/v.what.vect/v.what.vect.py
   grass/trunk/temporal/t.create/t.create.py
   grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py
   grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py
   grass/trunk/temporal/t.register/t.register.py
   grass/trunk/temporal/t.remove/t.remove.py
   grass/trunk/temporal/t.sample/t.sample.py
   grass/trunk/temporal/t.vect.db.select/t.vect.db.select.py
   grass/trunk/vector/v.buffer/main.c
   grass/trunk/vector/v.build.polylines/main.c
   grass/trunk/vector/v.build/main.c
   grass/trunk/vector/v.clean/main.c
   grass/trunk/vector/v.distance/main.c
   grass/trunk/vector/v.edit/main.c
   grass/trunk/vector/v.net.visibility/main.c
   grass/trunk/vector/v.random/main.c
   grass/trunk/vector/v.sample/main.c
   grass/trunk/vector/v.what.rast/main.c
   grass/trunk/vector/v.what.rast3/main.c
   grass/trunk/vector/v.what/main.c
Log:
homogenize keywords

Modified: grass/trunk/display/d.colorlist/main.c
===================================================================

--- grass/trunk/display/d.colorlist/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/display/d.colorlist/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -33,7 +33,7 @@
 
     module = G_define_module();
     G_add_keyword(_("display"));
-    G_add_keyword(_("setup"));
+    G_add_keyword(_("settings"));
     module->description =
 	"Output a list of all available display colors with a configurable "
 	"separator (default is comma).";

Modified: grass/trunk/display/d.font/main.c
===================================================================
--- grass/trunk/display/d.font/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/display/d.font/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -44,7 +44,7 @@
 
     module = G_define_module();
     G_add_keyword(_("display"));
-    G_add_keyword(_("setup"));
+    G_add_keyword(_("settings"));
     module->description =
 	_("Selects the font in which text will be displayed "
 	  "on the user's graphics monitor.");

Modified: grass/trunk/display/d.fontlist/main.c
===================================================================
--- grass/trunk/display/d.fontlist/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/display/d.fontlist/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -36,7 +36,7 @@
 
     module = G_define_module();
     G_add_keyword(_("display"));
-    G_add_keyword(_("setup"));
+    G_add_keyword(_("settings"));
     module->description = _("Lists the available fonts.");
 
     flagl = G_define_flag();

Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/imagery/i.pca/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -65,7 +65,7 @@
 
     module = G_define_module();
     G_add_keyword(_("imagery"));
-    G_add_keyword(_("image transformation"));
+    G_add_keyword(_("transformation"));
     G_add_keyword(_("PCA"));
     module->description = _("Principal components analysis (PCA) "
 			    "for image processing.");

Modified: grass/trunk/ps/ps.map/main.c
===================================================================
--- grass/trunk/ps/ps.map/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/ps/ps.map/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -91,7 +91,6 @@
     /* Set description */
     module = G_define_module();
     G_add_keyword(_("postscript"));
-    G_add_keyword(_("map"));
     G_add_keyword(_("printing"));
     module->description = _("Produces hardcopy PostScript map output.");
 

Modified: grass/trunk/raster/r.random/main.c
===================================================================
--- grass/trunk/raster/r.random/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/raster/r.random/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -49,8 +49,9 @@
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("sampling"));
+    G_add_keyword(_("vector"));
     G_add_keyword(_("random"));
-    G_add_keyword(_("vector"));
     module->description =
 	_("Creates a raster map layer and vector point map "
 	  "containing randomly located points.");

Modified: grass/trunk/raster/r.random.cells/main.c
===================================================================
--- grass/trunk/raster/r.random.cells/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/raster/r.random.cells/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -43,8 +43,8 @@
     /* Set description */
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("sampling"));
     G_add_keyword(_("random"));
-    G_add_keyword(_("cell"));
     module->description =
 	_("Generates random cell values with spatial dependence.");
 

Modified: grass/trunk/raster/r.random.surface/main.c
===================================================================
--- grass/trunk/raster/r.random.surface/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/raster/r.random.surface/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -55,8 +55,8 @@
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("surface"));
     G_add_keyword(_("random"));
-    G_add_keyword(_("surface"));
     module->description =
 	_("Generates random surface(s) with spatial dependence.");
 

Modified: grass/trunk/raster3d/r3.out.netcdf/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.netcdf/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/raster3d/r3.out.netcdf/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -584,8 +584,8 @@
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster3d"));
+    G_add_keyword(_("export"));
     G_add_keyword(_("netCDF"));
-    G_add_keyword(_("export"));
     module->description = _("Export a 3D raster map as netCDF file.");
 
     /* Get parameters from user */

Modified: grass/trunk/raster3d/r3.retile/main.c
===================================================================
--- grass/trunk/raster3d/r3.retile/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/raster3d/r3.retile/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -99,9 +99,9 @@
 
     module = G_define_module();
     G_add_keyword(_("raster3d"));
-    G_add_keyword(_("retile"));
+    G_add_keyword(_("tiling"));
     G_add_keyword(_("voxel"));
-    module->description = _("Retiles an existing RASTER3D map with user defined x, y and z tile size");
+    module->description = _("Retiles an existing 3D raster map with user defined x, y and z tile size.");
 
     /* Get parameters from user */
     set_params();
@@ -110,7 +110,7 @@
     if (G_parser(argc, argv))
         exit(EXIT_FAILURE);
 
-    G_debug(3, _("Open 3d raster map <%s>"), param.input->answer);
+    G_debug(3, "Open 3d raster map <%s>", param.input->answer);
 
     mapset = G_find_raster3d(param.input->answer, "");
     

Modified: grass/trunk/scripts/v.dissolve/v.dissolve.py
===================================================================
--- grass/trunk/scripts/v.dissolve/v.dissolve.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/scripts/v.dissolve/v.dissolve.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -18,8 +18,8 @@
 #%module
 #% description: Dissolves boundaries between adjacent areas sharing a common category number or attribute.
 #% keywords: vector
+#% keywords: dissolve
 #% keywords: area
-#% keywords: dissolve
 #%end
 #%option G_OPT_V_INPUT
 #%end

Modified: grass/trunk/scripts/v.in.sites.all/v.in.sites.all.py
===================================================================
--- grass/trunk/scripts/v.in.sites.all/v.in.sites.all.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/scripts/v.in.sites.all/v.in.sites.all.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -16,8 +16,8 @@
 #%module
 #% description: Converts all old GRASS < Ver5.7 sites maps in current mapset to vector maps.
 #% keywords: sites
+#% keywords: import
 #% keywords: vector
-#% keywords: import
 #%end
 
 import sys

Modified: grass/trunk/scripts/v.what.vect/v.what.vect.py
===================================================================
--- grass/trunk/scripts/v.what.vect/v.what.vect.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/scripts/v.what.vect/v.what.vect.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -16,6 +16,7 @@
 #%module
 #% description: Uploads vector values at positions of vector points to the table.
 #% keywords: vector
+#% keywords: sampling
 #% keywords: database
 #% keywords: attribute table
 #%end

Modified: grass/trunk/temporal/t.create/t.create.py
===================================================================
--- grass/trunk/temporal/t.create/t.create.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/temporal/t.create/t.create.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -17,6 +17,7 @@
 #%module
 #% description: Creates a space time dataset.
 #% keywords: temporal
+#% keywords: map management
 #% keywords: create
 #%end
 

Modified: grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -17,7 +17,7 @@
 #%module
 #% description: Performs r.mapcalc expressions on maps of sampled space time raster datasets.
 #% keywords: temporal
-#% keywords: mapcalc
+#% keywords: algebra
 #%end
 
 #%option G_OPT_STRDS_INPUTS

Modified: grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -17,7 +17,7 @@
 #%module
 #% description: Performs r3.mapcalc expressions on maps of sampled space time raster3d datasets.
 #% keywords: temporal
-#% keywords: mapcalc
+#% keywords: algebra
 #%end
 
 #%option G_OPT_STR3DS_INPUTS

Modified: grass/trunk/temporal/t.register/t.register.py
===================================================================
--- grass/trunk/temporal/t.register/t.register.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/temporal/t.register/t.register.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -17,6 +17,7 @@
 #%module
 #% description: Registers raster, vector and raster3d maps in a space time datasets.
 #% keywords: temporal
+#% keywords: map management
 #% keywords: register
 #%end
 

Modified: grass/trunk/temporal/t.remove/t.remove.py
===================================================================
--- grass/trunk/temporal/t.remove/t.remove.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/temporal/t.remove/t.remove.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -17,6 +17,7 @@
 #%module
 #% description: Removes space time datasets from temporal database.
 #% keywords: temporal
+#% keywords: map management
 #% keywords: remove
 #%end
 

Modified: grass/trunk/temporal/t.sample/t.sample.py
===================================================================
--- grass/trunk/temporal/t.sample/t.sample.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/temporal/t.sample/t.sample.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -17,7 +17,7 @@
 #%module
 #% description: Samples the input space time dataset(s) with a sample space time dataset and print the result to stdout.
 #% keywords: temporal
-#% keywords: sample
+#% keywords: sampling
 #%end
 
 #%option G_OPT_STDS_INPUTS

Modified: grass/trunk/temporal/t.vect.db.select/t.vect.db.select.py
===================================================================
--- grass/trunk/temporal/t.vect.db.select/t.vect.db.select.py	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/temporal/t.vect.db.select/t.vect.db.select.py	2012-08-22 19:17:24 UTC (rev 52838)
@@ -19,6 +19,7 @@
 #% keywords: temporal
 #% keywords: vector
 #% keywords: database
+#% keywords: attribute table
 #% keywords: select
 #%end
 

Modified: grass/trunk/vector/v.buffer/main.c
===================================================================
--- grass/trunk/vector/v.buffer/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.buffer/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -218,8 +218,8 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("buffer"));
     G_add_keyword(_("geometry"));
-    G_add_keyword(_("buffer"));
     module->description =
 	_("Creates a buffer around vector features of given type.");
 

Modified: grass/trunk/vector/v.build/main.c
===================================================================
--- grass/trunk/vector/v.build/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.build/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -34,8 +34,8 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("topology"));
     G_add_keyword(_("geometry"));
-    G_add_keyword(_("topology"));
     module->label = _("Creates topology for vector map.");
     module->description = _("Optionaly also checks for topological errors.");
 

Modified: grass/trunk/vector/v.build.polylines/main.c
===================================================================
--- grass/trunk/vector/v.build.polylines/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.build.polylines/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -110,8 +110,8 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("topology"));
     G_add_keyword(_("geometry"));
-    G_add_keyword(_("topology"));
     module->description = _("Builds polylines from lines or boundaries.");
 
     /* Define the options */

Modified: grass/trunk/vector/v.clean/main.c
===================================================================
--- grass/trunk/vector/v.clean/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.clean/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -48,6 +48,7 @@
     module = G_define_module();
     G_add_keyword(_("vector"));
     G_add_keyword(_("topology"));
+    G_add_keyword(_("geometry"));
     module->description = _("Toolset for cleaning topology of vector map.");
 
     opt.in = G_define_standard_option(G_OPT_V_INPUT);

Modified: grass/trunk/vector/v.distance/main.c
===================================================================
--- grass/trunk/vector/v.distance/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.distance/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -82,6 +82,7 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("distance"));
     G_add_keyword(_("database"));
     G_add_keyword(_("attribute table"));
     module->description =

Modified: grass/trunk/vector/v.edit/main.c
===================================================================
--- grass/trunk/vector/v.edit/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.edit/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -53,8 +53,8 @@
     module = G_define_module();
     module->overwrite = TRUE;
     G_add_keyword(_("vector"));
+    G_add_keyword(_("geometry"));
     G_add_keyword(_("editing"));
-    G_add_keyword(_("geometry"));
     module->description = _("Edits a vector map, allows adding, deleting "
 			    "and modifying selected vector features.");
 

Modified: grass/trunk/vector/v.net.visibility/main.c
===================================================================
--- grass/trunk/vector/v.net.visibility/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.net.visibility/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -43,6 +43,7 @@
     /* initialize module */
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("network"));
     G_add_keyword(_("path"));
     G_add_keyword(_("visibility"));
     module->description = _("Visibility graph construction.");

Modified: grass/trunk/vector/v.random/main.c
===================================================================
--- grass/trunk/vector/v.random/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.random/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -83,6 +83,7 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("sampling"));
     G_add_keyword(_("statistics"));
     G_add_keyword(_("random"));
     module->description = _("Generates randomly 2D/3D vector points map.");

Modified: grass/trunk/vector/v.sample/main.c
===================================================================
--- grass/trunk/vector/v.sample/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.sample/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -73,8 +73,8 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("sampling"));
     G_add_keyword(_("raster"));
-    G_add_keyword(_("resample"));
     module->description =
 	_("Samples a raster map at vector point locations.");
 

Modified: grass/trunk/vector/v.what/main.c
===================================================================
--- grass/trunk/vector/v.what/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.what/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -58,8 +58,8 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("querying"));
     G_add_keyword(_("position"));
-    G_add_keyword(_("querying"));
     module->description = _("Queries a vector map at given locations.");
 
     opt.map = G_define_standard_option(G_OPT_V_MAPS);

Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.what.rast/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -66,6 +66,7 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("sampling"));
     G_add_keyword(_("raster"));
     G_add_keyword(_("position"));
     G_add_keyword(_("querying"));

Modified: grass/trunk/vector/v.what.rast3/main.c
===================================================================
--- grass/trunk/vector/v.what.rast3/main.c	2012-08-22 15:47:59 UTC (rev 52837)
+++ grass/trunk/vector/v.what.rast3/main.c	2012-08-22 19:17:24 UTC (rev 52838)
@@ -62,6 +62,7 @@
 
     module = G_define_module();
     G_add_keyword(_("vector"));
+    G_add_keyword(_("sampling"));
     G_add_keyword(_("raster"));
     G_add_keyword(_("position"));
     G_add_keyword(_("querying"));

