Wed Sep 17 18:53:13 PDT 2014

Author: neteler
Date: 2014-09-17 18:53:13 -0700 (Wed, 17 Sep 2014)
New Revision: 62029

Modified:
   grass/branches/releasebranch_6_4/display/d.colorlist/main.c
   grass/branches/releasebranch_6_4/display/d.colortable/main.c
   grass/branches/releasebranch_6_4/display/d.rgb/main.c
   grass/branches/releasebranch_6_4/display/d.thematic.area/main.c
   grass/branches/releasebranch_6_4/general/g.findfile/main.c
   grass/branches/releasebranch_6_4/general/g.gisenv/main.c
   grass/branches/releasebranch_6_4/imagery/i.rectify/main.c
   grass/branches/releasebranch_6_4/raster/r.describe/main.c
   grass/branches/releasebranch_6_4/raster/r.in.bin/main.c
   grass/branches/releasebranch_6_4/raster/r.neighbors/main.c
   grass/branches/releasebranch_6_4/raster/r.out.gdal/main.c
   grass/branches/releasebranch_6_4/raster/r.out.ppm3/main.c
   grass/branches/releasebranch_6_4/raster/r.out.vrml/main.c
   grass/branches/releasebranch_6_4/raster/r.out.vtk/parameters.c
   grass/branches/releasebranch_6_4/raster/r.quantile/main.c
   grass/branches/releasebranch_6_4/raster/r.report/parse.c
   grass/branches/releasebranch_6_4/raster/r.resamp.rst/main.c
   grass/branches/releasebranch_6_4/raster/r.slope.aspect/main.c
   grass/branches/releasebranch_6_4/raster/r.sunmask/main.c
   grass/branches/releasebranch_6_4/raster/simwe/r.sim.sediment/main.c
   grass/branches/releasebranch_6_4/raster/simwe/r.sim.water/main.c
   grass/branches/releasebranch_6_4/raster3d/r3.cross.rast/main.c
   grass/branches/releasebranch_6_4/raster3d/r3.in.v5d/main.c
   grass/branches/releasebranch_6_4/raster3d/r3.mkdspf/main.c
   grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/parameters.c
   grass/branches/releasebranch_6_4/raster3d/r3.showdspf/main_ogl.c
   grass/branches/releasebranch_6_4/vector/v.label/main.c
   grass/branches/releasebranch_6_4/vector/v.net.centrality/main.c
   grass/branches/releasebranch_6_4/vector/v.net.components/main.c
   grass/branches/releasebranch_6_4/vector/v.net.connectivity/main.c
   grass/branches/releasebranch_6_4/vector/v.net.iso/main.c
   grass/branches/releasebranch_6_4/vector/v.net.salesman/main.c
   grass/branches/releasebranch_6_4/vector/v.net.steiner/main.c
   grass/branches/releasebranch_6_4/vector/v.net.visibility/main.c
   grass/branches/releasebranch_6_4/vector/v.transform/main.c
   grass/branches/releasebranch_6_4/vector/v.univar/main.c
Log:
user message harmonization update (partial backport of r62007, trac #2409)

Modified: grass/branches/releasebranch_6_4/display/d.colorlist/main.c
===================================================================

--- grass/branches/releasebranch_6_4/display/d.colorlist/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/display/d.colorlist/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -42,7 +42,7 @@
     sep->key = "fs";
     sep->type = TYPE_STRING;
     sep->required = NO;
-    sep->description = "character for separation of list items";
+    sep->description = "Character for separation of list items";
     sep->answer = ",";
 
     G_disable_interactive();

Modified: grass/branches/releasebranch_6_4/display/d.colortable/main.c
===================================================================
--- grass/branches/releasebranch_6_4/display/d.colortable/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/display/d.colortable/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -90,7 +90,7 @@
     skip_null = G_define_flag();
     skip_null->key = 'n';
     skip_null->description =
-	_("Don't draw a collar showing the NULL color in FP maps");
+	_("Do not draw a collar showing the NULL color in FP maps");
 
     /* Check command line */
     if (G_parser(argc, argv))

Modified: grass/branches/releasebranch_6_4/display/d.rgb/main.c
===================================================================
--- grass/branches/releasebranch_6_4/display/d.rgb/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/display/d.rgb/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -68,7 +68,7 @@
     for (i = 0; i < 3; i++) {
 	char buff[80];
 
-	sprintf(buff, _("Name of raster map to be used for '%s'"),
+	sprintf(buff, _("Name of raster map to be used for <%s>"),
 		color_names[i]);
 
 	B[i].opt = G_define_standard_option(G_OPT_R_MAP);

Modified: grass/branches/releasebranch_6_4/display/d.thematic.area/main.c
===================================================================
--- grass/branches/releasebranch_6_4/display/d.thematic.area/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/display/d.thematic.area/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -175,7 +175,7 @@
     algoinfo_flag = G_define_flag();
     algoinfo_flag->key = 'e';
     algoinfo_flag->description =
-	_("When printing legend info , include extended statistical info from classification algorithm");
+	_("When printing legend info, include extended statistical info from classification algorithm");
 
     nodraw_flag = G_define_flag();
     nodraw_flag->key = 'n';

Modified: grass/branches/releasebranch_6_4/general/g.findfile/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.findfile/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/general/g.findfile/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -62,7 +62,7 @@
 
     n_flag = G_define_flag();
     n_flag->key = 'n';
-    n_flag->description = _("Don't add quotes");
+    n_flag->description = _("Do not add quotes");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/branches/releasebranch_6_4/general/g.gisenv/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.gisenv/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/general/g.gisenv/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -8,7 +8,7 @@
  *               Hamish Bowman <hamish_b yahoo.com>,
  *               Markus Neteler <neteler itc.it>
  * PURPOSE:      
- * COPYRIGHT:    (C) 2003-2006 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2003-2006, 2011 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
  *               License (>=v2). Read the file COPYING that comes with GRASS
@@ -45,6 +45,7 @@
     get->description = _("GRASS variable to get");
     get->key_desc = "VARIABLE";
     get->required = NO;
+    get->guisection = _("Get");
 
     set = G_define_option();
     set->key = "set";
@@ -52,6 +53,7 @@
     set->description = _("GRASS variable to set");
     set->key_desc = "VARIABLE=value";
     set->required = NO;
+    set->guisection = _("Set");
 
     store_opt = G_define_option();
     store_opt->key = "store";
@@ -60,14 +62,17 @@
     store_opt->answer = "gisrc";
     store_opt->description = _("Where GRASS variable is stored");
     store_opt->required = NO;
+    store_opt->guisection = _("Set");
 
     flag_s = G_define_flag();
     flag_s->key = 's';
     flag_s->description = _("Use shell syntax (for \"eval\")");
+    flag_s->guisection = _("Format");
 
     flag_n = G_define_flag();
     flag_n->key = 'n';
-    flag_n->description = _("Don't use shell syntax");
+    flag_n->description = _("Do not use shell syntax");
+    flag_n->guisection = _("Format");
 
     if (argc > 1 && G_parser(argc, argv) < 0)
 	exit(EXIT_FAILURE);

Modified: grass/branches/releasebranch_6_4/imagery/i.rectify/main.c
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.rectify/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/imagery/i.rectify/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -109,7 +109,7 @@
     val->key = "order";
     val->type = TYPE_INTEGER;
     val->required = YES;
-    val->description = _("Rectification polynom order (1-3)");
+    val->description = _("Rectification polynomial order (1-3)");
 
     tres = G_define_option();
     tres->key = "res";

Modified: grass/branches/releasebranch_6_4/raster/r.describe/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.describe/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.describe/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -99,7 +99,7 @@
 
     flag.i = G_define_flag();
     flag.i->key = 'i';
-    flag.i->description = _("Read fp map as integer");
+    flag.i->description = _("Read floating-point map as integer");
 
     /* please, remove before GRASS 7 released */
     q_flag = G_define_flag();

Modified: grass/branches/releasebranch_6_4/raster/r.in.bin/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.in.bin/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.in.bin/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -252,7 +252,7 @@
 
     flag.swap = G_define_flag();
     flag.swap->key = 'b';
-    flag.swap->description = _("Byte Swap the Data During Import");
+    flag.swap->description = _("Byte swap the data during import");
     flag.swap->guisection = _("Settings");
 
     flag.gmt_hd = G_define_flag();

Modified: grass/branches/releasebranch_6_4/raster/r.neighbors/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.neighbors/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.neighbors/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -146,7 +146,7 @@
     parm.title->key_desc = "\"phrase\"";
     parm.title->type = TYPE_STRING;
     parm.title->required = NO;
-    parm.title->description = _("Title of the output raster map");
+    parm.title->description = _("Title for output raster map");
 
     parm.weight = G_define_option();
     parm.weight->key = "weight";

Modified: grass/branches/releasebranch_6_4/raster/r.out.gdal/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.out.gdal/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.out.gdal/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -189,7 +189,7 @@
     createopt->label =
 	_("Creation option(s) to pass to the output format driver");
     createopt->description =
-	_("In the form of \"NAME=VALUE\", separate multiple entries with a comma.");
+	_("In the form of \"NAME=VALUE\", separate multiple entries with a comma");
     createopt->multiple = YES;
     createopt->required = NO;
 

Modified: grass/branches/releasebranch_6_4/raster/r.out.ppm3/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.out.ppm3/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.out.ppm3/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -82,7 +82,7 @@
     ppm_file->multiple = NO;
     ppm_file->answer = NULL;
     ppm_file->description =
-	_("Name for new PPM file. (use out=- for stdout)");
+	_("Name for new PPM file. (use '-' for stdout)");
 
     /* please, remove before GRASS 7 released */
     bequiet = G_define_flag();

Modified: grass/branches/releasebranch_6_4/raster/r.out.vrml/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.out.vrml/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.out.vrml/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -60,7 +60,7 @@
     rast_co->type = TYPE_STRING;
     rast_co->required = NO;
     rast_co->gisprompt = "old,cell,raster";
-    rast_co->description = _("Name of color file");
+    rast_co->description = _("Name of color map");
 
     exag_opt = G_define_option();
     exag_opt->key = "exag";

Modified: grass/branches/releasebranch_6_4/raster/r.out.vtk/parameters.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.out.vtk/parameters.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.out.vtk/parameters.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -20,8 +20,6 @@
 #include <grass/config.h>
 #include "parameters.h"
 
-
-
 /* ************************************************************************* */
 /* PARAMETERS ************************************************************** */
 /* ************************************************************************* */
@@ -73,7 +71,7 @@
     param.rgbmaps->multiple = YES;
     param.rgbmaps->guisection = "Advanced options";
     param.rgbmaps->description =
-	_("Three (r,g,b) raster maps to create rgb values [redmap,greenmap,bluemap]");
+	_("Three (r,g,b) raster maps to create RGB values [redmap,greenmap,bluemap]");
 
     param.vectmaps = G_define_option();
     param.vectmaps->key = "vectormaps";
@@ -89,8 +87,8 @@
     param.elevscale->key = "elevscale";
     param.elevscale->type = TYPE_DOUBLE;
     param.elevscale->required = NO;
-    param.elevscale->guisection = "Advanced options";
     param.elevscale->description = _("Scale factor for elevation");
+    param.elevscale->guisection = "Advanced options";
     param.elevscale->answer = "1.0";
 
     param.decimals = G_define_option();
@@ -126,13 +124,13 @@
     param.origin->key = 'o';
     param.origin->guisection = "Advanced options";
     param.origin->description =
-	_("Scale factor effects the origin (if no elevation map is given)");
+	_("Scale factor affects the origin (if no elevation map is given)");
 
     param.coorcorr = G_define_flag();
     param.coorcorr->key = 'c';
     param.coorcorr->guisection = "Advanced options";
     param.coorcorr->description =
-	_("Correct the coordinates to fit the VTK-OpenGL precision");
+	_("Correct the coordinates to match the VTK-OpenGL precision");
 
 
     /* 

Modified: grass/branches/releasebranch_6_4/raster/r.quantile/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.quantile/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.quantile/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -279,7 +279,7 @@
 
     flag.r = G_define_flag();
     flag.r->key = 'r';
-    flag.r->description = _("Generate recode rules based on quantile-defined intervals.");
+    flag.r->description = _("Generate recode rules based on quantile-defined intervals");
  
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/branches/releasebranch_6_4/raster/r.report/parse.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.report/parse.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.report/parse.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -81,7 +81,7 @@
     parms.outfile->description =
 	_("Name of an output file to hold the report");
 
-    parms.nsteps = G_define_option();
+		    parms.nsteps = G_define_option();
     parms.nsteps->key = "nsteps";
     parms.nsteps->type = TYPE_INTEGER;
     parms.nsteps->required = NO;

Modified: grass/branches/releasebranch_6_4/raster/r.resamp.rst/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.resamp.rst/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.resamp.rst/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -266,7 +266,7 @@
     parm.theta->key = "theta";
     parm.theta->type = TYPE_DOUBLE;
     parm.theta->required = NO;
-    parm.theta->description = _("Anisotropy angle (in degrees)");
+    parm.theta->description = _("Anisotropy angle (in degrees counterclockwise from East)");
     parm.theta->guisection = _("Anisotropy");
 
     parm.scalex = G_define_option();

Modified: grass/branches/releasebranch_6_4/raster/r.slope.aspect/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.slope.aspect/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.slope.aspect/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -251,7 +251,7 @@
     parm.min_slp_allowed = G_define_option();
     parm.min_slp_allowed->key = "min_slp_allowed";
     parm.min_slp_allowed->description =
-	_("Minimum slope val. (in percent) for which aspect is computed");
+	_("Minimum slope value (in percent) for which aspect is computed");
     parm.min_slp_allowed->type = TYPE_DOUBLE;
     parm.min_slp_allowed->required = NO;
     parm.min_slp_allowed->answer = "0.0";

Modified: grass/branches/releasebranch_6_4/raster/r.sunmask/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.sunmask/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/r.sunmask/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -128,7 +128,7 @@
     parm.opt3->required = NO;
     parm.opt3->options = "0-89.999";
     parm.opt3->description =
-	_("Altitude of the sun above horizon, degrees (A)");
+	_("Altitude of the sun in degrees above the horizon (A)");
     parm.opt3->guisection = _("Position");
 
     parm.opt4 = G_define_option();
@@ -137,7 +137,7 @@
     parm.opt4->required = NO;
     parm.opt4->options = "0-360";
     parm.opt4->description =
-	_("Azimuth of the sun from the north, degrees (A)");
+	_("Azimuth of the sun in degrees from north (A)");
     parm.opt4->guisection = _("Position");
 
     parm.year = G_define_option();
@@ -219,7 +219,7 @@
 
     flag1 = G_define_flag();
     flag1->key = 'z';
-    flag1->description = _("Don't ignore zero elevation");
+    flag1->description = _("Do not ignore zero elevation");
 
     flag2 = G_define_flag();
     flag2->key = 'v';

Modified: grass/branches/releasebranch_6_4/raster/simwe/r.sim.sediment/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/simwe/r.sim.sediment/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/simwe/r.sim.sediment/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -115,46 +115,46 @@
 
     parm.elevin = G_define_standard_option(G_OPT_R_INPUT);
     parm.elevin->key = "elevin";
-    parm.elevin->description = _("Name of the elevation raster map [m]");
+    parm.elevin->description = _("Name of elevation raster map [m]");
     parm.elevin->guisection = _("Input");
 
     parm.wdepth = G_define_standard_option(G_OPT_R_INPUT);
     parm.wdepth->key = "wdepth";
-    parm.wdepth->description = _("Name of the water depth raster map [m]");
+    parm.wdepth->description = _("Name of water depth raster map [m]");
     parm.wdepth->guisection = _("Input");
 
     parm.dxin = G_define_standard_option(G_OPT_R_INPUT);
     parm.dxin->key = "dxin";
-    parm.dxin->description = _("Name of the x-derivatives raster map [m/m]");
+    parm.dxin->description = _("Name of x-derivatives raster map [m/m]");
     parm.dxin->guisection = _("Input");
 
     parm.dyin = G_define_standard_option(G_OPT_R_INPUT);
     parm.dyin->key = "dyin";
-    parm.dyin->description = _("Name of the y-derivatives raster map [m/m]");
+    parm.dyin->description = _("Name of y-derivatives raster map [m/m]");
     parm.dyin->guisection = _("Input");
 
     parm.detin = G_define_standard_option(G_OPT_R_INPUT);
     parm.detin->key = "detin";
     parm.detin->description =
-	_("Name of the detachment capacity coefficient raster map [s/m]");
+	_("Name of detachment capacity coefficient raster map [s/m]");
     parm.detin->guisection = _("Input");
 
     parm.tranin = G_define_standard_option(G_OPT_R_INPUT);
     parm.tranin->key = "tranin";
     parm.tranin->description =
-	_("Name of the transport capacity coefficient raster map [s]");
+	_("Name of transport capacity coefficient raster map [s]");
     parm.tranin->guisection = _("Input");
 
     parm.tauin = G_define_standard_option(G_OPT_R_INPUT);
     parm.tauin->key = "tauin";
     parm.tauin->description =
-	_("Name of the critical shear stress raster map [Pa]");
+	_("Name of critical shear stress raster map [Pa]");
     parm.tauin->guisection = _("Input");
 
     parm.manin = G_define_standard_option(G_OPT_R_INPUT);
     parm.manin->key = "manin";
     parm.manin->required = NO;
-    parm.manin->description = _("Name of the Manning's n raster map");
+    parm.manin->description = _("Name of Manning's n raster map");
     parm.manin->guisection = _("Input");
 
     parm.maninval = G_define_option();
@@ -165,46 +165,46 @@
     parm.maninval->description = _("Manning's n unique value");
     parm.maninval->guisection = _("Input");
 
-    /* needs to be updated to GRASS 6 vector format !! 
+/* needs to be updated to GRASS 6 vector format !! 
     parm.sfile = G_define_standard_option(G_OPT_V_INPUT);
     parm.sfile->key = "vector";
     parm.sfile->required = NO;
     parm.sfile->description =
-	_("Name of the sampling locations vector points map");
+	_("Name of sampling locations vector points map");
     parm.sfile->guisection = _("Input");
 */
 
     parm.tc = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.tc->key = "tc";
     parm.tc->required = NO;
-    parm.tc->description = _("Output transport capacity raster map [kg/ms]");
+    parm.tc->description = _("Name for output transport capacity raster map [kg/ms]");
     parm.tc->guisection = _("Output");
 
     parm.et = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.et->key = "et";
     parm.et->required = NO;
     parm.et->description =
-	_("Output transp.limited erosion-deposition raster map [kg/m2s]");
+	_("Name for output transport limited erosion-deposition raster map [kg/m2s]");
     parm.et->guisection = _("Output");
 
     parm.conc = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.conc->key = "conc";
     parm.conc->required = NO;
     parm.conc->description =
-	_("Output sediment concentration raster map [particle/m3]");
+	_("Name for output sediment concentration raster map [particle/m3]");
     parm.conc->guisection = _("Output");
 
     parm.flux = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.flux->key = "flux";
     parm.flux->required = NO;
-    parm.flux->description = _("Output sediment flux raster map [kg/ms]");
+    parm.flux->description = _("Name for output sediment flux raster map [kg/ms]");
     parm.flux->guisection = _("Output");
 
     parm.erdep = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.erdep->key = "erdep";
     parm.erdep->required = NO;
     parm.erdep->description =
-	_("Output erosion-deposition raster map [kg/m2s]");
+	_("Name for output erosion-deposition raster map [kg/m2s]");
     parm.erdep->guisection = _("Output");
 
     parm.nwalk = G_define_option();

Modified: grass/branches/releasebranch_6_4/raster/simwe/r.sim.water/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/simwe/r.sim.water/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster/simwe/r.sim.water/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -122,24 +122,24 @@
 
     parm.elevin = G_define_standard_option(G_OPT_R_INPUT);
     parm.elevin->key = "elevin";
-    parm.elevin->description = _("Name of the elevation raster map [m]");
+    parm.elevin->description = _("Name of elevation raster map [m]");
     parm.elevin->guisection = _("Input");
 
     parm.dxin = G_define_standard_option(G_OPT_R_INPUT);
     parm.dxin->key = "dxin";
-    parm.dxin->description = _("Name of the x-derivatives raster map [m/m]");
+    parm.dxin->description = _("Name of x-derivatives raster map [m/m]");
     parm.dxin->guisection = _("Input");
 
     parm.dyin = G_define_standard_option(G_OPT_R_INPUT);
     parm.dyin->key = "dyin";
-    parm.dyin->description = _("Name of the y-derivatives raster map [m/m]");
+    parm.dyin->description = _("Name of y-derivatives raster map [m/m]");
     parm.dyin->guisection = _("Input");
 
     parm.rain = G_define_standard_option(G_OPT_R_INPUT);
     parm.rain->key = "rain";
     parm.rain->required = NO;
     parm.rain->description =
-	_("Name of the rainfall excess rate (rain-infilt) raster map [mm/hr]");
+	_("Name of rainfall excess rate (rain-infilt) raster map [mm/hr]");
     parm.rain->guisection = _("Input");
 
     parm.rainval = G_define_option();
@@ -155,7 +155,7 @@
     parm.infil->key = "infil";
     parm.infil->required = NO;
     parm.infil->description =
-	_("Name of the runoff infiltration rate raster map [mm/hr]");
+	_("Name of runoff infiltration rate raster map [mm/hr]");
     parm.infil->guisection = _("Input");
 
     parm.infilval = G_define_option();
@@ -170,7 +170,7 @@
     parm.manin = G_define_standard_option(G_OPT_R_INPUT);
     parm.manin->key = "manin";
     parm.manin->required = NO;
-    parm.manin->description = _("Name of the Manning's n raster map");
+    parm.manin->description = _("Name of Manning's n raster map");
     parm.manin->guisection = _("Input");
 
     parm.maninval = G_define_option();
@@ -185,34 +185,34 @@
     parm.traps->key = "traps";
     parm.traps->required = NO;
     parm.traps->description =
-	_("Name of the flow controls raster map (permeability ratio 0-1)");
+	_("Name of flow controls raster map (permeability ratio 0-1)");
     parm.traps->guisection = _("Input");
 
-/*
+/* needs to be updated to GRASS 6 vector format !! 
     parm.sfile = G_define_standard_option(G_OPT_V_INPUT);
     parm.sfile->key = "vector";
     parm.sfile->required = NO;
     parm.sfile->description =
-	_("Name of the sampling locations vector points map");
+	_("Name of sampling locations vector points map");
     parm.sfile->guisection = _("Input");
 */
 
     parm.depth = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.depth->key = "depth";
     parm.depth->required = NO;
-    parm.depth->description = _("Output water depth raster map [m]");
+    parm.depth->description = _("Name for output water depth raster map [m]");
     parm.depth->guisection = _("Output");
 
     parm.disch = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.disch->key = "disch";
     parm.disch->required = NO;
-    parm.disch->description = _("Output water discharge raster map [m3/s]");
+    parm.disch->description = _("Name for output water discharge raster map [m3/s]");
     parm.disch->guisection = _("Output");
 
     parm.err = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.err->key = "err";
     parm.err->required = NO;
-    parm.err->description = _("Output simulation error raster map [m]");
+    parm.err->description = _("Name for output simulation error raster map [m]");
     parm.err->guisection = _("Output");
 
 /*
@@ -220,7 +220,7 @@
     parm.outwalk->key = "outwalk";
     parm.outwalk->required = NO;
     parm.outwalk->description =
-	_("Name of the output walkers vector points map");
+	_("Name for output walkers vector points map");
     parm.outwalk->guisection = _("Output");
 */
 
@@ -229,7 +229,7 @@
     parm.nwalk->type = TYPE_INTEGER;
     parm.nwalk->required = NO;
     parm.nwalk->description =
-	_("Number of walkers, default is twice the no. of cells");
+	_("Number of walkers, default is twice the number of cells");
     parm.nwalk->guisection = _("Parameters");
 
     parm.niter = G_define_option();
@@ -272,8 +272,9 @@
     parm.hmax->type = TYPE_DOUBLE;
     parm.hmax->answer = HMAX;
     parm.hmax->required = NO;
-    parm.hmax->description =
-	_("Threshold water depth [m] (diffusion increases after this water depth is reached)");
+    parm.hmax->label =
+	_("Threshold water depth [m]");
+    parm.hmax->description = _("Diffusion increases after this water depth is reached");
     parm.hmax->guisection = _("Parameters");
 
     parm.halpha = G_define_option();
@@ -297,7 +298,6 @@
     flag.tserie->key = 't';
     flag.tserie->description = _("Time-series output");
 
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

Modified: grass/branches/releasebranch_6_4/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.cross.rast/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster3d/r3.cross.rast/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -88,7 +88,7 @@
     param.input->type = TYPE_STRING;
     param.input->required = YES;
     param.input->gisprompt = "old,grid3,3d-raster";
-    param.input->description = _("Input 3D raster map for cross section.");
+    param.input->description = _("Input 3D raster map for cross section");
 
     param.elevation = G_define_option();
     param.elevation->key = "elevation";

Modified: grass/branches/releasebranch_6_4/raster3d/r3.in.v5d/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.in.v5d/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster3d/r3.in.v5d/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -71,7 +71,7 @@
     param.output->type = TYPE_STRING;
     param.output->required = YES;
     param.output->multiple = NO;
-    param.output->gisprompt = "any,grid3,3d raster";
+    param.output->gisprompt = "any,grid3,3d-raster";
     param.output->description = "Name for 3D raster map";
 
     param.nv = G_define_option();

Modified: grass/branches/releasebranch_6_4/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.mkdspf/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster3d/r3.mkdspf/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -74,15 +74,15 @@
     module = G_define_module();
     module->keywords = _("raster3d, voxel");
     module->description =
-	_("Creates a display file from an existing grid3 file according to specified threshold levels.");
+	_("Creates a display file from an existing 3D raster map according to specified threshold levels.");
 
     name = G_define_option();
     name->key = "input";
     name->type = TYPE_STRING;
     name->required = YES;
-    name->gisprompt = "old,grid3,3dcell";
+    name->gisprompt = "old,grid3,3d-raster";
     /* should still find the DIRECTORY */
-    name->description = _("Name of an existing 3d raster map");
+    name->description = _("Name of an existing 3D raster map");
 
     out = G_define_option();
     out->key = "dspf";

Modified: grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/parameters.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/parameters.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/parameters.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -53,7 +53,7 @@
     param.top->gisprompt = "old,cell,raster";
     param.top->multiple = NO;
     param.top->guisection = "Surface options";
-    param.top->description = _("top surface 2D raster map");
+    param.top->description = _("Top surface 2D raster map");
 
     param.bottom = G_define_option();
     param.bottom->key = "bottom";
@@ -62,13 +62,13 @@
     param.bottom->gisprompt = "old,cell,raster";
     param.bottom->multiple = NO;
     param.bottom->guisection = "Surface options";
-    param.bottom->description = _("bottom surface 2D raster map");
+    param.bottom->description = _("Bottom surface 2D raster map");
 
     param.structgrid = G_define_flag();
     param.structgrid->key = 's';
     param.structgrid->guisection = "Surface options";
     param.structgrid->description =
-	_("Create 3d elevation output with a top and a bottom surface, both raster maps are required.");
+	_("Create 3D elevation output with a top and a bottom surface, both raster maps are required.");
 
 
     param.rgbmaps = G_define_option();
@@ -119,13 +119,13 @@
     param.origin = G_define_flag();
     param.origin->key = 'o';
     param.origin->guisection = "Advanced options";
-    param.origin->description = _("Scale factor effects the origin");
+    param.origin->description = _("Scale factor affects the origin");
 
     param.coorcorr = G_define_flag();
     param.coorcorr->key = 'c';
     param.coorcorr->guisection = "Advanced options";
     param.coorcorr->description =
-	_("Correct the coordinates to fit the VTK-OpenGL precision");
+	_("Correct the coordinates to match the VTK-OpenGL precision");
 
     /* Maybe needed in the future
      * param.xml = G_define_flag ();

Modified: grass/branches/releasebranch_6_4/raster3d/r3.showdspf/main_ogl.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.showdspf/main_ogl.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/raster3d/r3.showdspf/main_ogl.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -108,7 +108,7 @@
     g3->key = "grid3";
     g3->type = TYPE_STRING;
     g3->required = YES;
-    g3->gisprompt = "old,grid3,3dcell";
+    g3->gisprompt = "old,grid3,3d-raster";
     g3->description = "Name of an existing 3D raster map";
 
     dspf = G_define_option();

Modified: grass/branches/releasebranch_6_4/vector/v.label/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.label/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.label/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -154,7 +154,7 @@
 
     Rotation = G_define_option();
     Rotation->key = "rotation";
-    Rotation->description = _("Rotation angle (degrees counter-clockwise)");
+    Rotation->description = _("Rotation angle in degrees (counter-clockwise)");
     Rotation->type = TYPE_DOUBLE;
     Rotation->required = NO;
     Rotation->options = "0-360";

Modified: grass/branches/releasebranch_6_4/vector/v.net.centrality/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.centrality/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.net.centrality/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -159,7 +159,7 @@
     error_opt->type = TYPE_DOUBLE;
     error_opt->required = NO;
     error_opt->description =
-	_("Cummulative error tolerance for eigenvector centrality");
+	_("Cumulative error tolerance for eigenvector centrality");
 
     geo_f = G_define_flag();
     geo_f->key = 'g';

Modified: grass/branches/releasebranch_6_4/vector/v.net.components/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.components/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.net.components/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -7,7 +7,7 @@
  *
  * PURPOSE:    Computes strongly and weakly connected components
  *
- * COPYRIGHT:  (C) 2002-2005 by the GRASS Development Team
+ * COPYRIGHT:  (C) 2002-2014 by the GRASS Development Team
  *
  *             This program is free software under the
  *             GNU General Public License (>=v2).

Modified: grass/branches/releasebranch_6_4/vector/v.net.connectivity/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.connectivity/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.net.connectivity/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -7,7 +7,7 @@
  *
  * PURPOSE:    Vertex connectivity between two sets of nodes
  *
- * COPYRIGHT:  (C) 2002-2005 by the GRASS Development Team
+ * COPYRIGHT:  (C) 2002-20014 by the GRASS Development Team
  *
  *             This program is free software under the
  *             GNU General Public License (>=v2).

Modified: grass/branches/releasebranch_6_4/vector/v.net.iso/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.iso/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.net.iso/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -110,9 +110,9 @@
     term_opt->key = "ccats";
     term_opt->required = YES;
     term_opt->description =
-	_("Categories of centres (points on nodes) to which net "
-	  "will be allocated. "
-	  "Layer for this categories is given by nlayer option.");
+	_("Categories of centers (points on nodes) to which net "
+	  "will be allocated, "
+	  "layer for this categories is given by nlayer option");
 
     cost_opt = G_define_option();
     cost_opt->key = "costs";

Modified: grass/branches/releasebranch_6_4/vector/v.net.salesman/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.salesman/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.net.salesman/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -13,8 +13,8 @@
  *                GNU General Public License (>=v2). 
  *                Read the file COPYING that comes with GRASS
  *                for details.
- * 
- **************************************************************/
+ *
+ ****************************************************************/
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

Modified: grass/branches/releasebranch_6_4/vector/v.net.steiner/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.steiner/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.net.steiner/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -386,7 +386,7 @@
     nsp_opt->required = NO;
     nsp_opt->multiple = NO;
     nsp_opt->answer = "-1";
-    nsp_opt->description = _("Number of steiner points (-1 for all possible)");
+    nsp_opt->description = _("Number of Steiner points (-1 for all possible)");
 
     geo_f = G_define_flag();
     geo_f->key = 'g';

Modified: grass/branches/releasebranch_6_4/vector/v.net.visibility/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.visibility/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.net.visibility/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -62,7 +62,7 @@
     ovis->key = "vis";
     ovis->type = TYPE_STRING;
     ovis->required = NO;
-    ovis->description = _("Add points after computing the vis graph");
+    ovis->description = _("Add points after computing the visibility graph");
 
     /* options and flags parser */
     if (G_parser(argc, argv))

Modified: grass/branches/releasebranch_6_4/vector/v.transform/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.transform/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.transform/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -181,7 +181,7 @@
     zrot->required = NO;
     zrot->multiple = NO;
     zrot->description =
-	_("Rotation around z axis in degrees counterclockwise");
+	_("Rotation around z axis in degrees (counter-clockwise)");
     zrot->answer = "0.0";
     zrot->guisection = _("Custom");
 

Modified: grass/branches/releasebranch_6_4/vector/v.univar/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.univar/main.c	2014-09-18 01:52:02 UTC (rev 62028)
+++ grass/branches/releasebranch_6_4/vector/v.univar/main.c	2014-09-18 01:53:13 UTC (rev 62029)
@@ -133,7 +133,7 @@
 
     geometry = G_define_flag();
     geometry->key = 'd';
-    geometry->description = _("Calculate geometry distances instead of table data.");
+    geometry->description = _("Calculate geometry distances instead of table data");
 
     G_gisinit(argv[0]);
 

