user message harmonization update (trac https://trac.osgeo.org/grass/…

…ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@62007 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.colorlist/main.c

@@ -43,7 +43,7 @@ int main(int argc, char **argv)
     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 = ",";
 
     if (G_parser(argc, argv))

display/d.colortable/main.c

@@ -89,7 +89,7 @@ int main(int argc, char **argv)
     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))

display/d.path/main.c

@@ -59,7 +59,7 @@ int main(int argc, char **argv)
     type_opt->description = _("Arc type");
 
     coor_opt = G_define_option();
-    coor_opt->key = "coor";
+    coor_opt->key = "coordinates";
     coor_opt->key_desc = "x1,y1,x2,y2";
     coor_opt->type = TYPE_STRING;
     coor_opt->required = YES;
@@ -68,27 +68,27 @@ int main(int argc, char **argv)
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
     afield_opt->key = "alayer";
     afield_opt->answer = "1";
-    afield_opt->description = _("Arc layer");
+    afield_opt->label = _("Arc layer");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
     nfield_opt->key = "nlayer";
     nfield_opt->answer = "2";
-    nfield_opt->description = _("Node layer");
+    nfield_opt->label = _("Node layer");
 
     afcol = G_define_option();
-    afcol->key = "afcol";
+    afcol->key = "afcolumn";
     afcol->type = TYPE_STRING;
     afcol->required = NO;
-    afcol->description = _("Arc forward/both direction(s) cost column");
+    afcol->description = _("Arc forward/both direction(s) cost column (number)");
 
     abcol = G_define_option();
-    abcol->key = "abcol";
+    abcol->key = "abcolumn";
     abcol->type = TYPE_STRING;
     abcol->required = NO;
-    abcol->description = _("Arc backward direction cost column");
+    abcol->description = _("Arc backward direction cost column (number)");
 
     ncol = G_define_option();
-    ncol->key = "ncol";
+    ncol->key = "ncolumn";
     ncol->type = TYPE_STRING;
     ncol->required = NO;
     ncol->description = _("Node cost column");

display/d.rgb/main.c

@@ -66,7 +66,7 @@ int main(int argc, char **argv)
     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);

display/d.thematic.area/main.c

@@ -166,7 +166,7 @@ int main(int argc, char **argv)
     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';

general/g.cairocomp/main.c

@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
 
     flag_d = G_define_flag();
     flag_d->key = 'd';
-    flag_d->description = _("Don't composite; just delete input Pixmaps");
+    flag_d->description = _("Do not composite; just delete input Pixmaps");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

general/g.copy/main.c

@@ -1,7 +1,7 @@
 
 /****************************************************************************
  *
- * MODULE:       cmd
+ * MODULE:       g.copy
  * AUTHOR(S):    CERL (original contributor)
  *               Radim Blazek <radim.blazek gmail.com>, 
  *               Cedric Shock <cedricgrass shockfamily.net>, 

general/g.findfile/main.c

@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 
     n_flag = G_define_flag();
     n_flag->key = 'n';
-    n_flag->description = _("Don't add quotes");
+    n_flag->description = _("Do not add quotes");
 
     l_flag = G_define_flag();
     l_flag->key = 'l';

general/g.gisenv/main.c

@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
 
     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 (G_parser(argc, argv))

general/g.mapsets/main.c

@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
     opt.op->required = YES;
     opt.op->multiple = NO;
     opt.op->options = "set,add,remove";
-    opt.op->description = _("Operation to perform");
+    opt.op->description = _("Operation to be performed");
     opt.op->guisection = _("Search path");
     opt.op->answer = "add";
 

general/g.remove/main.c

@@ -1,7 +1,7 @@
 \
 /****************************************************************************
  *
- * MODULE:       cmd
+ * MODULE:       g.remove
  * AUTHOR(S):    CERL (original contributor)
  *               Radim Blazek <radim.blazek gmail.com>, 
  *               Cedric Shock <cedricgrass shockfamily.net>, 

general/g.rename/main.c

@@ -1,7 +1,7 @@
 
 /****************************************************************************
  *
- * MODULE:       g.rename cmd
+ * MODULE:       g.rename
  * AUTHOR(S):    CERL (original contributor)
  *               Radim Blazek <radim.blazek gmail.com>, 
  *               Cedric Shock <cedricgrass shockfamily.net>, 

imagery/i.albedo/main.c

@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 
     flag1 = G_define_flag();
     flag1->key = 'm';
-    flag1->description = _("Modis (7 input bands:1,2,3,4,5,6,7)");
+    flag1->description = _("MODIS (7 input bands:1,2,3,4,5,6,7)");
 
     flag2 = G_define_flag();
     flag2->key = 'n';
@@ -124,18 +124,18 @@ int main(int argc, char *argv[])
 
     flag5 = G_define_flag();
     flag5->key = 'a';
-    flag5->description = _("Aster (6 input bands:1,3,5,6,8,9)");
+    flag5->description = _("ASTER (6 input bands:1,3,5,6,8,9)");
 
     flag6 = G_define_flag();
     flag6->key = 'c';
-    flag6->label = _("Agressive mode (Landsat)");
+    flag6->label = _("Aggressive mode (Landsat)");
     flag6->description =
     _("Albedo dry run to calculate some water to beach/sand/desert stretching, "
       "a kind of simple atmospheric correction");
 
     flag7 = G_define_flag();
     flag7->key = 'd';
-    flag7->label = _("Soft mode (Modis)");
+    flag7->label = _("Soft mode (MODIS)");
     flag7->description =
     _("Albedo dry run to calculate some water to beach/sand/desert stretching, "
       "a kind of simple atmospheric correction");

imagery/i.eb.eta/main.c

@@ -12,8 +12,7 @@
  *   	    	 for details.
  *
  *****************************************************************************/
-
-
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -50,7 +49,7 @@ int main(int argc, char *argv[])
     /* Define the different options */ 
     input1 = G_define_standard_option(G_OPT_R_INPUT);
     input1->key = "netradiationdiurnal";
-    input1->description = _("Name of the diurnal Net Radiation map [W/m2]");
+    input1->description = _("Name of the diurnal net radiation map [W/m2]");
     input1->answer = "rnetday";
 
     input2 = G_define_standard_option(G_OPT_R_INPUT);

imagery/i.eb.evapfr/main.c

@@ -82,6 +82,7 @@ int main(int argc, char *argv[])
     flag1->description =
 	_("Root zone soil moisture output (Makin, Molden and Bastiaanssen, 2001)");
 
+    /********************/
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

imagery/i.eb.hsebal01/main.c

@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
     input_Rn = G_define_standard_option(G_OPT_R_INPUT);
     input_Rn->key = "netradiation";
     input_Rn->description =
-	_("Name of instantaneous Net Radiation raster map [W/m2]");
+	_("Name of instantaneous net radiation raster map [W/m2]");
 
     input_g0 = G_define_standard_option(G_OPT_R_INPUT);
     input_g0->key = "soilheatflux";

imagery/i.eb.netrad/main.c

@@ -13,8 +13,7 @@
  *   	    	 for details.
  *
  *****************************************************************************/
-
-
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -50,8 +49,9 @@ int main(int argc, char *argv[])
     void *inrast_doy, *inrast_sunzangle;
     DCELL * outrast;
     CELL val1,val2; /*For color range*/
-    /************************************/ 
+
     G_gisinit(argv[0]);
+
     module = G_define_module();
     G_add_keyword(_("imagery"));
     G_add_keyword(_("energy balance"));
@@ -62,53 +62,44 @@ int main(int argc, char *argv[])
 
 	/* Define the different options */ 
     input1 = G_define_standard_option(G_OPT_R_INPUT);
-    input1->key = _("albedo");
-    input1->description = _("Name of the Albedo map [0.0;1.0]");
-    input1->answer = _("albedo");
+    input1->key = "albedo";
+    input1->description = _("Name of albedo raster map [0.0;1.0]");
 
     input2 = G_define_standard_option(G_OPT_R_INPUT);
-    input2->key = _("ndvi");
-    input2->description = _("Name of the NDVI map [-1.0;+1.0]");
-    input2->answer = _("ndvi");
+    input2->key = "ndvi";
+    input2->description = _("Name of NDVI raster map [-1.0;+1.0]");
 
     input3 = G_define_standard_option(G_OPT_R_INPUT);
-    input3->key = _("temperature");
+    input3->key = "temperature";
     input3->description =
-	_("Name of the surface temperature map [K]");
-    input3->answer = _("tempk");
+	_("Name of surface temperature raster map [K]");
 
     input4 = G_define_standard_option(G_OPT_R_INPUT);
-    input4->key = _("localutctime");
+    input4->key = "localutctime";
     input4->description =
-	_("Name of the map of local UTC time of satellite overpass [hh.hhh]");
-    input4->answer = _("time");
+	_("Name of time of satellite overpass raster map [local time in UTC]"); 
 
     input5 = G_define_standard_option(G_OPT_R_INPUT);
-    input5->key = _("temperaturedifference2m");
+    input5->key = "temperaturedifference2m";
     input5->description =
 	_("Name of the difference map of temperature from surface skin to about 2 m height [K]");
-    input5->answer = _("dtair");
 
     input6 = G_define_standard_option(G_OPT_R_INPUT);
-    input6->key = _("emissivity");
+    input6->key = "emissivity";
     input6->description = _("Name of the emissivity map [-]");
-    input6->answer = _("emissivity");
 
     input7 = G_define_standard_option(G_OPT_R_INPUT);
-    input7->key = _("transmissivitysingleway");
+    input7->key = "transmissivitysingleway";
     input7->description =
 	_("Name of the single-way atmospheric transmissivitymap [-]");
-    input7->answer = _("tsw");
 
     input8 = G_define_standard_option(G_OPT_R_INPUT);
-    input8->key = _("dayofyear");
+    input8->key = "dayofyear";
     input8->description = _("Name of the Day Of Year (DOY) map [-]");
-    input8->answer = _("doy");
 
     input9 = G_define_standard_option(G_OPT_R_INPUT);
-    input9->key = _("sunzenithangle");
+    input9->key = "sunzenithangle";
     input9->description = _("Name of the sun zenith angle map [degrees]");
-    input9->answer = _("sunzangle");
 
     output1 = G_define_standard_option(G_OPT_R_OUTPUT);
     output1->description = _("Name of the output net radiation layer");

imagery/i.eb.soilheatflux/main.c

@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
     /* Define the different options */ 
     input1 = G_define_standard_option(G_OPT_R_INPUT);
     input1->key = "albedo";
-    input1->description = _("Name of Albedo raster map [0.0;1.0]");
+    input1->description = _("Name of albedo raster map [0.0;1.0]");
 
     input2 = G_define_standard_option(G_OPT_R_INPUT);
     input2->key = "ndvi";

imagery/i.pca/main.c

@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
     flag_filt = G_define_flag();
     flag_filt->key = 'f';
     flag_filt->label = (_("Output will be filtered input bands"));
-    flag_filt->description = (_("Applies inverse PCA after PCA"));
+    flag_filt->description = (_("Apply inverse PCA after PCA"));
     flag_filt->guisection = _("Filter");
 
     if (G_parser(argc, argv))

imagery/i.rectify/main.c

@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
     val->options = "1-3";
     val->answer = "1";
     val->required = YES;
-    val->description = _("Rectification polynom order (1-3)");
+    val->description = _("Rectification polynomial order (1-3)");
 
     tres = G_define_option();
     tres->key = "res";

raster/r.colors/edit_colors.c

@@ -118,7 +118,7 @@ int edit_colors(int argc, char **argv, int type, const char *maptype,
     flag.w = G_define_flag();
     flag.w->key = 'w';
     flag.w->description =
-        _("Only write new color table if one doesn't already exist");
+        _("Only write new color table if it does not already exist");
     flag.w->guisection = _("Define");
 
     flag.l = G_define_flag();

raster/r.describe/main.c

@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 
     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");
 
     if (0 > G_parser(argc, argv))
 	exit(EXIT_FAILURE);

raster/r.external/main.c

@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     parm.band->key = "band";
     parm.band->type = TYPE_INTEGER;
     parm.band->required = NO;
-    parm.band->description = _("Band to select (default: all)");
+    parm.band->description = _("Band to select (default is all bands)");
     parm.band->guisection = _("Input");
 
     parm.title = G_define_option();

raster/r.gwflow/main.c

@@ -59,7 +59,7 @@ void set_params(void)
     param.status = G_define_standard_option(G_OPT_R_INPUT);
     param.status->key = "status";
     param.status->description =
-	_("Name of input raster map providing Boundary condition status: 0-inactive, 1-active, 2-dirichlet");
+	_("Name of input raster map providing boundary condition status: 0-inactive, 1-active, 2-dirichlet");
 
     param.hc_x =G_define_standard_option(G_OPT_R_INPUT);
     param.hc_x->key = "hc_x";

raster/r.in.bin/main.c

@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
 
     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();

raster/r.in.gdal/main.c

@@ -103,7 +103,8 @@ int main(int argc, char *argv[])
     parm.memory->required = NO;
     parm.memory->options = "0-2047";
     parm.memory->answer = "300";
-    parm.memory->description = _("Cache size (MiB)");
+    parm.memory->label = _("Maximum memory to be used (in MB)");
+    parm.memory->description = _("Cache size for raster rows");
 
     parm.target = G_define_option();
     parm.target->key = "target";

raster/r.kappa/main.c

@@ -86,7 +86,7 @@ int main(int argc, char **argv)
     parms.output->required = NO;
     parms.output->label =
 	_("Name for output file containing error matrix and kappa");
-    parms.output->description = _("If not given, print to startdard output");
+    parms.output->description = _("If not given write to standard output");
     parms.output->guisection = _("Output settings");
 
     parms.titles = G_define_option();

raster/r.neighbors/main.c

@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
     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_standard_option(G_OPT_F_INPUT);
     parm.weight->key = "weight";