[GRASS-SVN] r62007 - in grass/trunk: display/d.colorlist display/d.colortable display/d.path display/d.rgb display/d.thematic.area general/g.cairocomp general/g.copy general/g.findfile general/g.gisenv general/g.mapsets general/g.remove general/g.rename imagery/i.albedo imagery/i.eb.eta imagery/i.eb.evapfr imagery/i.eb.hsebal01 imagery/i.eb.netrad imagery/i.eb.soilheatflux imagery/i.pca imagery/i.rectify raster/r.colors raster/r.describe raster/r.external raster/r.gwflow raster/r.in.bin raster/r.in.gdal raster/r.kappa raster/r.neighbors raster/r.out.gdal raster/r.out.png raster/r.out.ppm3 raster/r.out.vrml raster/r.out.vtk raster/r.proj raster/r.quantile raster/r.random.cells raster/r.random.surface raster/r.reclass raster/r.recode raster/r.report raster/r.resamp.bspline raster/r.resamp.rst raster/r.series raster/r.series.accumulate raster/r.slope.aspect raster/r.stats.quantile raster/r.stream.extract raster/r.sunhours raster/r.sunmask raster/r.terraflow raster/r.topmodel raster /r.viewshed raster/r.walk raster/simwe/r.sim.sediment raster/simwe/r.sim.water raster3d/r3.cross.rast raster3d/r3.gwflow raster3d/r3.in.v5d raster3d/r3.mkdspf raster3d/r3.null raster3d/r3.out.vtk raster3d/r3.showdspf scripts/g.extension scripts/m.proj scripts/r.fillnulls scripts/r.in.wms scripts/r.mask temporal/t.info temporal/t.rast.accdetect temporal/t.rast.aggregate.ds temporal/t.rast.colors temporal/t.rast.import temporal/t.rast.mapcalc temporal/t.rast.to.rast3 temporal/t.rast3d.extract temporal/t.rast3d.mapcalc temporal/t.sample temporal/t.vect.import vector/v.buffer vector/v.clean vector/v.colors vector/v.colors.out vector/v.edit vector/v.in.ascii vector/v.in.lidar vector/v.label vector/v.lidar.growing vector/v.net vector/v.net.alloc vector/v.net.centrality vector/v.net.components vector/v.net.connectivity vector/v.net.iso vector/v.net.path vector/v.net.salesman vector/v.net.steiner vector/v.net.visibility vector/v.out.postgis vector/v.qcount vector/v.rectify vector/v. surf.bspline vector/v.to.rast vector/v.transform vector/v.univar vector/v.vol.rst vector/v.what vector/v.what.rast3
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Sep 16 23:41:01 PDT 2014
Author: neteler
Date: 2014-09-16 23:41:01 -0700 (Tue, 16 Sep 2014)
New Revision: 62007
Modified:
grass/trunk/display/d.colorlist/main.c
grass/trunk/display/d.colortable/main.c
grass/trunk/display/d.path/main.c
grass/trunk/display/d.rgb/main.c
grass/trunk/display/d.thematic.area/main.c
grass/trunk/general/g.cairocomp/main.c
grass/trunk/general/g.copy/main.c
grass/trunk/general/g.findfile/main.c
grass/trunk/general/g.gisenv/main.c
grass/trunk/general/g.mapsets/main.c
grass/trunk/general/g.remove/main.c
grass/trunk/general/g.rename/main.c
grass/trunk/imagery/i.albedo/main.c
grass/trunk/imagery/i.eb.eta/main.c
grass/trunk/imagery/i.eb.evapfr/main.c
grass/trunk/imagery/i.eb.hsebal01/main.c
grass/trunk/imagery/i.eb.netrad/main.c
grass/trunk/imagery/i.eb.soilheatflux/main.c
grass/trunk/imagery/i.pca/main.c
grass/trunk/imagery/i.rectify/main.c
grass/trunk/raster/r.colors/edit_colors.c
grass/trunk/raster/r.describe/main.c
grass/trunk/raster/r.external/main.c
grass/trunk/raster/r.gwflow/main.c
grass/trunk/raster/r.in.bin/main.c
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.kappa/main.c
grass/trunk/raster/r.neighbors/main.c
grass/trunk/raster/r.out.gdal/main.c
grass/trunk/raster/r.out.png/main.c
grass/trunk/raster/r.out.ppm3/main.c
grass/trunk/raster/r.out.vrml/main.c
grass/trunk/raster/r.out.vtk/parameters.c
grass/trunk/raster/r.proj/main.c
grass/trunk/raster/r.quantile/main.c
grass/trunk/raster/r.random.cells/main.c
grass/trunk/raster/r.random.surface/r.random.surface.html
grass/trunk/raster/r.reclass/main.c
grass/trunk/raster/r.recode/main.c
grass/trunk/raster/r.report/parse.c
grass/trunk/raster/r.resamp.bspline/main.c
grass/trunk/raster/r.resamp.rst/main.c
grass/trunk/raster/r.series.accumulate/main.c
grass/trunk/raster/r.series/main.c
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/raster/r.stats.quantile/main.c
grass/trunk/raster/r.stream.extract/main.c
grass/trunk/raster/r.sunhours/main.c
grass/trunk/raster/r.sunmask/main.c
grass/trunk/raster/r.terraflow/main.cpp
grass/trunk/raster/r.topmodel/main.c
grass/trunk/raster/r.viewshed/main.cpp
grass/trunk/raster/r.walk/main.c
grass/trunk/raster/simwe/r.sim.sediment/main.c
grass/trunk/raster/simwe/r.sim.water/main.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.gwflow/main.c
grass/trunk/raster3d/r3.in.v5d/main.c
grass/trunk/raster3d/r3.mkdspf/main.c
grass/trunk/raster3d/r3.null/main.c
grass/trunk/raster3d/r3.out.vtk/parameters.c
grass/trunk/raster3d/r3.showdspf/main_ogl.c
grass/trunk/scripts/g.extension/g.extension.py
grass/trunk/scripts/m.proj/m.proj.py
grass/trunk/scripts/r.fillnulls/r.fillnulls.py
grass/trunk/scripts/r.in.wms/r.in.wms.py
grass/trunk/scripts/r.mask/r.mask.py
grass/trunk/temporal/t.info/t.info.py
grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py
grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
grass/trunk/temporal/t.rast.colors/t.rast.colors.py
grass/trunk/temporal/t.rast.import/t.rast.import.py
grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py
grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py
grass/trunk/temporal/t.rast3d.extract/t.rast3d.extract.py
grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py
grass/trunk/temporal/t.sample/t.sample.py
grass/trunk/temporal/t.vect.import/t.vect.import.py
grass/trunk/vector/v.buffer/main.c
grass/trunk/vector/v.clean/main.c
grass/trunk/vector/v.colors.out/main.c
grass/trunk/vector/v.colors/main.c
grass/trunk/vector/v.edit/args.c
grass/trunk/vector/v.in.ascii/main.c
grass/trunk/vector/v.in.lidar/main.c
grass/trunk/vector/v.label/main.c
grass/trunk/vector/v.lidar.growing/main.c
grass/trunk/vector/v.net.alloc/main.c
grass/trunk/vector/v.net.centrality/main.c
grass/trunk/vector/v.net.components/main.c
grass/trunk/vector/v.net.connectivity/main.c
grass/trunk/vector/v.net.iso/main.c
grass/trunk/vector/v.net.path/main.c
grass/trunk/vector/v.net.salesman/main.c
grass/trunk/vector/v.net.steiner/main.c
grass/trunk/vector/v.net.visibility/main.c
grass/trunk/vector/v.net/args.c
grass/trunk/vector/v.out.postgis/args.c
grass/trunk/vector/v.qcount/main.c
grass/trunk/vector/v.rectify/main.c
grass/trunk/vector/v.surf.bspline/main.c
grass/trunk/vector/v.to.rast/main.c
grass/trunk/vector/v.transform/main.c
grass/trunk/vector/v.univar/main.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/vector/v.what.rast3/main.c
grass/trunk/vector/v.what/main.c
Log:
user message harmonization update (trac #2409)
Modified: grass/trunk/display/d.colorlist/main.c
===================================================================
--- grass/trunk/display/d.colorlist/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/display/d.colorlist/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -43,7 +43,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 = ",";
if (G_parser(argc, argv))
Modified: grass/trunk/display/d.colortable/main.c
===================================================================
--- grass/trunk/display/d.colortable/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/display/d.colortable/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -89,7 +89,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/trunk/display/d.path/main.c
===================================================================
--- grass/trunk/display/d.path/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/display/d.path/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -59,7 +59,7 @@
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 @@
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");
Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/display/d.rgb/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -66,7 +66,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/trunk/display/d.thematic.area/main.c
===================================================================
--- grass/trunk/display/d.thematic.area/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/display/d.thematic.area/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -166,7 +166,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/trunk/general/g.cairocomp/main.c
===================================================================
--- grass/trunk/general/g.cairocomp/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/general/g.cairocomp/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -241,7 +241,7 @@
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);
Modified: grass/trunk/general/g.copy/main.c
===================================================================
--- grass/trunk/general/g.copy/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/general/g.copy/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -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>,
Modified: grass/trunk/general/g.findfile/main.c
===================================================================
--- grass/trunk/general/g.findfile/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/general/g.findfile/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -66,7 +66,7 @@
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';
Modified: grass/trunk/general/g.gisenv/main.c
===================================================================
--- grass/trunk/general/g.gisenv/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/general/g.gisenv/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -87,7 +87,7 @@
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))
Modified: grass/trunk/general/g.mapsets/main.c
===================================================================
--- grass/trunk/general/g.mapsets/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/general/g.mapsets/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -79,7 +79,7 @@
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";
Modified: grass/trunk/general/g.remove/main.c
===================================================================
--- grass/trunk/general/g.remove/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/general/g.remove/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -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>,
Modified: grass/trunk/general/g.rename/main.c
===================================================================
--- grass/trunk/general/g.rename/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/general/g.rename/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -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>,
Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/imagery/i.albedo/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -108,7 +108,7 @@
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 @@
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");
Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/imagery/i.eb.eta/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -12,8 +12,7 @@
* for details.
*
*****************************************************************************/
-
-
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -50,7 +49,7 @@
/* 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);
Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/imagery/i.eb.evapfr/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -82,6 +82,7 @@
flag1->description =
_("Root zone soil moisture output (Makin, Molden and Bastiaanssen, 2001)");
+ /********************/
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/trunk/imagery/i.eb.hsebal01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.hsebal01/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/imagery/i.eb.hsebal01/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -91,7 +91,7 @@
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";
Modified: grass/trunk/imagery/i.eb.netrad/main.c
===================================================================
--- grass/trunk/imagery/i.eb.netrad/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/imagery/i.eb.netrad/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -13,8 +13,7 @@
* for details.
*
*****************************************************************************/
-
-
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -50,8 +49,9 @@
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 @@
/* 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");
Modified: grass/trunk/imagery/i.eb.soilheatflux/main.c
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -55,7 +55,7 @@
/* 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";
Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/imagery/i.pca/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -119,7 +119,7 @@
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))
Modified: grass/trunk/imagery/i.rectify/main.c
===================================================================
--- grass/trunk/imagery/i.rectify/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/imagery/i.rectify/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -121,7 +121,7 @@
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";
Modified: grass/trunk/raster/r.colors/edit_colors.c
===================================================================
--- grass/trunk/raster/r.colors/edit_colors.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.colors/edit_colors.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -118,7 +118,7 @@
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();
Modified: grass/trunk/raster/r.describe/main.c
===================================================================
--- grass/trunk/raster/r.describe/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.describe/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -95,7 +95,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");
if (0 > G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/trunk/raster/r.external/main.c
===================================================================
--- grass/trunk/raster/r.external/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.external/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -77,7 +77,7 @@
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();
Modified: grass/trunk/raster/r.gwflow/main.c
===================================================================
--- grass/trunk/raster/r.gwflow/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.gwflow/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -59,7 +59,7 @@
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";
Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.in.bin/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -254,7 +254,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/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.in.gdal/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -103,7 +103,8 @@
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";
Modified: grass/trunk/raster/r.kappa/main.c
===================================================================
--- grass/trunk/raster/r.kappa/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.kappa/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -86,7 +86,7 @@
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();
Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.neighbors/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -216,7 +216,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_standard_option(G_OPT_F_INPUT);
parm.weight->key = "weight";
Modified: grass/trunk/raster/r.out.gdal/main.c
===================================================================
--- grass/trunk/raster/r.out.gdal/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.out.gdal/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -145,18 +145,18 @@
flag_c = G_define_flag();
flag_c->key = 'c';
flag_c->label = _("Do not write GDAL standard colortable");
- flag_c->description = _("Only applicable to Byte or UInt16 data types.");
+ flag_c->description = _("Only applicable to Byte or UInt16 data types");
flag_c->guisection = _("Creation");
flag_t = G_define_flag();
flag_t->key = 't';
flag_t->label = _("Write raster attribute table");
- flag_t->description = _("Some export formats may not be supported.");
+ flag_t->description = _("Some export formats may not be supported");
flag_f = G_define_flag();
flag_f->key = 'f';
flag_f->label = _("Force raster export despite any warnings of data loss");
- flag_f->description = _("Overrides nodata safety check.");
+ flag_f->description = _("Overrides nodata safety check");
input = G_define_standard_option(G_OPT_R_INPUT);
input->description = _("Name of raster map (or group) to export");
@@ -201,7 +201,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;
createopt->guisection = _("Creation");
Modified: grass/trunk/raster/r.out.png/main.c
===================================================================
--- grass/trunk/raster/r.out.png/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.out.png/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -119,7 +119,7 @@
png_file = G_define_standard_option(G_OPT_F_OUTPUT);
png_file->required = YES;
- png_file->description = _("Name for new PNG file (use out=- for stdout)");
+ png_file->description = _("Name for new PNG file (use '-' for stdout)");
compr = G_define_option();
compr->key = "compression";
Modified: grass/trunk/raster/r.out.ppm3/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm3/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.out.ppm3/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -81,7 +81,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)");
comment = G_define_flag();
comment->key = 'c';
Modified: grass/trunk/raster/r.out.vrml/main.c
===================================================================
--- grass/trunk/raster/r.out.vrml/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.out.vrml/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -62,7 +62,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/trunk/raster/r.out.vtk/parameters.c
===================================================================
--- grass/trunk/raster/r.out.vtk/parameters.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.out.vtk/parameters.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -20,8 +20,6 @@
#include <grass/config.h>
#include "parameters.h"
-
-
/* ************************************************************************* */
/* PARAMETERS ************************************************************** */
/* ************************************************************************* */
@@ -68,7 +66,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";
@@ -84,8 +82,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();
@@ -121,13 +119,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/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.proj/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -162,7 +162,7 @@
imapset = G_define_standard_option(G_OPT_M_MAPSET);
imapset->label = _("Mapset containing input raster map");
- imapset->description = _("default: name of current mapset");
+ imapset->description = _("Default: name of current mapset");
imapset->guisection = _("Source");
indbase = G_define_option();
@@ -195,7 +195,9 @@
memory->key = "memory";
memory->type = TYPE_INTEGER;
memory->required = NO;
- memory->description = _("Cache size (MiB)");
+ memory->answer = "300";
+ memory->label = _("Maximum memory to be used (in MB)");
+ memory->description = _("Cache size for raster rows");
res = G_define_option();
res->key = "resolution";
Modified: grass/trunk/raster/r.quantile/main.c
===================================================================
--- grass/trunk/raster/r.quantile/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.quantile/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -282,7 +282,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/trunk/raster/r.random.cells/main.c
===================================================================
--- grass/trunk/raster/r.random.cells/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.random.cells/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -57,7 +57,7 @@
Distance->required = YES;
Distance->multiple = NO;
Distance->description =
- _("Maximum distance of spatial correlation (value(s) >= 0.0)");
+ _("Maximum distance of spatial correlation (value >= 0.0)");
SeedStuff = G_define_option();
SeedStuff->key = "seed";
Modified: grass/trunk/raster/r.random.surface/r.random.surface.html
===================================================================
--- grass/trunk/raster/r.random.surface/r.random.surface.html 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.random.surface/r.random.surface.html 2014-09-17 06:41:01 UTC (rev 62007)
@@ -145,7 +145,7 @@
<em>
<a href="r.random.html">r.random</a>,
- <a href="r.random.cell.html">r.random.cell</a>,
+ <a href="r.random.cells.html">r.random.cells</a>,
<a href="r.mapcalc.html">r.mapcalc</a>
</em>
Modified: grass/trunk/raster/r.reclass/main.c
===================================================================
--- grass/trunk/raster/r.reclass/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.reclass/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -63,13 +63,13 @@
parm.rules = G_define_standard_option(G_OPT_F_INPUT);
parm.rules->key = "rules";
parm.rules->label = _("File containing reclass rules");
- parm.rules->description = _("\"-\" to read from stdin");
+ parm.rules->description = _("'-' for standard input");
parm.title = G_define_option();
parm.title->key = "title";
parm.title->required = NO;
parm.title->type = TYPE_STRING;
- parm.title->description = _("Title for the resulting raster map");
+ parm.title->description = _("Title for output raster map");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/trunk/raster/r.recode/main.c
===================================================================
--- grass/trunk/raster/r.recode/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.recode/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -57,7 +57,7 @@
parm.rules = G_define_standard_option(G_OPT_F_INPUT);
parm.rules->key = "rules";
parm.rules->label = _("File containing recode rules");
- parm.rules->description = _("\"-\" to read from stdin");
+ parm.rules->description = _("'-' for standard input");
parm.title = G_define_option();
parm.title->key = "title";
Modified: grass/trunk/raster/r.report/parse.c
===================================================================
--- grass/trunk/raster/r.report/parse.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.report/parse.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -64,7 +64,7 @@
parms.outfile->label =
_("Name for output file to hold the report");
parms.outfile->description =
- _("If no output given report is printed to standard output");
+ _("If no output file given report is printed to standard output");
parms.nv = G_define_option();
parms.nv->key = "null";
@@ -93,7 +93,7 @@
parms.pw->description = pw_desc;
parms.pw->guisection = _("Formatting");
- 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/trunk/raster/r.resamp.bspline/main.c
===================================================================
--- grass/trunk/raster/r.resamp.bspline/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.resamp.bspline/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -148,7 +148,8 @@
memory_opt->type = TYPE_INTEGER;
memory_opt->required = NO;
memory_opt->answer = "300";
- memory_opt->description = _("Maximum memory to be used (in MB)");
+ memory_opt->label = _("Maximum memory to be used (in MB)");
+ memory_opt->description = _("Cache size for raster rows");
/*----------------------------------------------------------------*/
/* Parsing */
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.resamp.rst/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -259,7 +259,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/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.series/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -184,7 +184,7 @@
flag.lazy = G_define_flag();
flag.lazy->key = 'z';
- flag.lazy->description = _("Don't keep files open");
+ flag.lazy->description = _("Do not keep files open");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/trunk/raster/r.series.accumulate/main.c
===================================================================
--- grass/trunk/raster/r.series.accumulate/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.series.accumulate/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -160,7 +160,7 @@
flag.lazy = G_define_flag();
flag.lazy->key = 'z';
- flag.lazy->description = _("Don't keep files open");
+ flag.lazy->description = _("Do not keep files open");
flag.float_output = G_define_flag();
flag.float_output->key = 'f';
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.slope.aspect/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -247,7 +247,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/trunk/raster/r.stats.quantile/main.c
===================================================================
--- grass/trunk/raster/r.stats.quantile/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.stats.quantile/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -427,7 +427,7 @@
flag.p = G_define_flag();
flag.p->key = 'p';
flag.p->description =
- _("Don't create output maps; just print statistics");
+ _("Do not create output maps; just print statistics");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/trunk/raster/r.stream.extract/main.c
===================================================================
--- grass/trunk/raster/r.stream.extract/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.stream.extract/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -138,7 +138,8 @@
input.memory->type = TYPE_INTEGER;
input.memory->required = NO;
input.memory->answer = "300";
- input.memory->description = _("Maximum memory to be used in MB");
+ input.memory->label = _("Maximum memory to be used (in MB)");
+ input.memory->description = _("Cache size for raster rows");
output.stream_rast = G_define_standard_option(G_OPT_R_OUTPUT);
output.stream_rast->key = "stream_rast";
Modified: grass/trunk/raster/r.sunhours/main.c
===================================================================
--- grass/trunk/raster/r.sunhours/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.sunhours/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -5,6 +5,7 @@
* AUTHOR(S): Markus Metz
* PURPOSE: Calculates solar azimuth and angle, and
* sunshine hours (also called daytime period)
+ * Uses NREL SOLPOS
* COPYRIGHT: (C) 2010-2013 by the GRASS Development Team
*
* This program is free software under the GNU General Public
@@ -88,7 +89,7 @@
parm.sunhours = G_define_standard_option(G_OPT_R_OUTPUT);
parm.sunhours->key = "sunhour";
parm.sunhours->label = _("Output raster map with sunshine hours");
- parm.sunhours->description = _("Sunshine hours require solpos and Greenwich standard time");
+ parm.sunhours->description = _("Sunshine hours require SOLPOS use and Greenwich standard time");
parm.sunhours->required = NO;
parm.year = G_define_option();
@@ -149,7 +150,7 @@
parm.no_solpos = G_define_flag();
parm.no_solpos->key = 's';
- parm.no_solpos->description = _("Do not use solpos algorithm of NREL");
+ parm.no_solpos->description = _("Do not use SOLPOS algorithm of NREL");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
@@ -187,7 +188,7 @@
se_sin = 0;
if (use_solpos && lst_time) {
- G_warning(_("NREL solpos algorithm uses Greenwich standard time."));
+ G_warning(_("NREL SOLPOS algorithm uses Greenwich standard time."));
G_warning(_("Time will be interpreted as Greenwich standard time."));
lst_time = 0;
@@ -199,7 +200,7 @@
G_message(_("Time will be interpreted as Greenwich standard time."));
if (sunhour_name)
- G_fatal_error(_("Sunshine hours require NREL solpos."));
+ G_fatal_error(_("Sunshine hours require NREL SOLPOS."));
}
if ((G_projection() != PROJECTION_LL)) {
Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.sunmask/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -132,7 +132,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();
@@ -141,7 +141,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();
@@ -224,7 +224,7 @@
flag1 = G_define_flag();
flag1->key = 'z';
- flag1->description = _("Don't ignore zero elevation");
+ flag1->description = _("Do not ignore zero elevation");
flag3 = G_define_flag();
flag3->key = 's';
Modified: grass/trunk/raster/r.terraflow/main.cpp
===================================================================
--- grass/trunk/raster/r.terraflow/main.cpp 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.terraflow/main.cpp 2014-09-17 06:41:01 UTC (rev 62007)
@@ -102,7 +102,9 @@
struct Flag *sfd_flag;
sfd_flag = G_define_flag() ;
sfd_flag->key = 's';
- sfd_flag->description= _("SFD (D8) flow (default is MFD)");
+ sfd_flag->label= _("SFD (D8) flow (default is MFD)");
+ sfd_flag->description =
+ _("SFD: single flow direction, MFD: multiple flow direction");
/* D8CUT value*/
struct Option *d8cut;
@@ -122,8 +124,8 @@
mem->key = "memory";
mem->type = TYPE_INTEGER;
mem->required = NO;
- mem->answer = "300"; /* 300MB default value */
- mem->description = _("Maximum runtime memory size (in MB)");
+ mem->answer = "300";
+ mem->description = _("Maximum memory to be used (in MB)");
/* temporary STREAM path */
struct Option *streamdir;
Modified: grass/trunk/raster/r.topmodel/main.c
===================================================================
--- grass/trunk/raster/r.topmodel/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.topmodel/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -73,7 +73,7 @@
params.timestep = G_define_option();
params.timestep->key = "timestep";
params.timestep->label = _("Time step");
- params.timestep->description = _("Generate output for this time step.");
+ params.timestep->description = _("Generate output for this time step");
params.timestep->type = TYPE_INTEGER;
params.timestep->required = NO;
@@ -81,7 +81,7 @@
params.topidxclass->key = "topidxclass";
params.topidxclass->label = _("Topographic index class");
params.topidxclass->description =
- _("Generate output for this topographic index class.");
+ _("Generate output for this topographic index class");
params.topidxclass->type = TYPE_INTEGER;
params.topidxclass->required = NO;
@@ -90,7 +90,7 @@
params.topidx->label =
_("Name of input topographic index raster map");
params.topidx->description =
- _("Must be clipped to the catchment boundary. Used for generating outtopidxstats.");
+ _("Must be clipped to the catchment boundary. Used for generating outtopidxstats");
params.topidx->required = NO;
params.topidx->guisection = _("Preprocess");
@@ -98,7 +98,7 @@
params.ntopidxclasses->key = "ntopidxclasses";
params.ntopidxclasses->label = _("Number of topographic index classes");
params.ntopidxclasses->description =
- _("Used for generating outtopidxstats.");
+ _("Used for generating outtopidxstats");
params.ntopidxclasses->type = TYPE_INTEGER;
params.ntopidxclasses->required = NO;
params.ntopidxclasses->answer = "30";
@@ -109,7 +109,7 @@
params.outtopidxstats->label =
_("Name for output topographic index statistics file");
params.outtopidxstats->description =
- _("Requires topidx and ntopidxclasses.");
+ _("Requires topidx and ntopidxclasses");
params.outtopidxstats->required = NO;
params.outtopidxstats->guisection = _("Preprocess");
Modified: grass/trunk/raster/r.viewshed/main.cpp
===================================================================
--- grass/trunk/raster/r.viewshed/main.cpp 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.viewshed/main.cpp 2014-09-17 06:41:01 UTC (rev 62007)
@@ -563,7 +563,7 @@
memAmountOpt->required = NO;
memAmountOpt->key_desc = "value";
memAmountOpt->description =
- _("Amount of memory to be used in MB");
+ _("Amount of memory to use in MB");
memAmountOpt->answer = "500";
/* temporary STREAM path */
Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/r.walk/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -301,7 +301,7 @@
flag3 = G_define_flag();
flag3->key = 'n';
- flag3->description = _("Keep null values in output map");
+ flag3->description = _("Keep null values in output raster map");
flag3->guisection = _("NULL cells");
flag4 = G_define_flag();
Modified: grass/trunk/raster/simwe/r.sim.sediment/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.sediment/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/simwe/r.sim.sediment/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -149,7 +149,7 @@
parm.manin = G_define_standard_option(G_OPT_R_INPUT);
parm.manin->key = "man";
parm.manin->required = NO;
- parm.manin->description = _("Name of mannings n raster map");
+ parm.manin->description = _("Name of Manning's n raster map");
parm.manin->guisection = _("Input");
parm.maninval = G_define_option();
@@ -157,7 +157,7 @@
parm.maninval->type = TYPE_DOUBLE;
parm.maninval->answer = MANINVAL;
parm.maninval->required = NO;
- parm.maninval->description = _("Name of mannings n value");
+ parm.maninval->description = _("Name of Manning's n value");
parm.maninval->guisection = _("Input");
parm.outwalk = G_define_standard_option(G_OPT_V_OUTPUT);
@@ -191,7 +191,7 @@
parm.et->key = "et";
parm.et->required = NO;
parm.et->description =
- _("Name for 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);
Modified: grass/trunk/raster/simwe/r.sim.water/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.water/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster/simwe/r.sim.water/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -220,7 +220,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();
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -87,7 +87,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/trunk/raster3d/r3.gwflow/main.c
===================================================================
--- grass/trunk/raster3d/r3.gwflow/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster3d/r3.gwflow/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -114,7 +114,7 @@
param.budget->key = "budget";
param.budget->required = NO;
param.budget->description =
- _("Output 3D raster map Storing the groundwater budget for each cell [m^3/s]\n");
+ _("Output 3D raster map storing the groundwater budget for each cell [m^3/s]");
param.dt = N_define_standard_option(N_OPT_CALC_TIME);
param.maxit = N_define_standard_option(N_OPT_MAX_ITERATIONS);
@@ -124,7 +124,7 @@
param.mask = G_define_flag();
param.mask->key = 'm';
- param.mask->description = _("Use RASTER3D mask (if exists)");
+ param.mask->description = _("Use 3D raster mask (if exists)");
param.full_les = G_define_flag();
param.full_les->key = 'f';
Modified: grass/trunk/raster3d/r3.in.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.v5d/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster3d/r3.in.v5d/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -72,7 +72,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/trunk/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster3d/r3.mkdspf/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -79,15 +79,15 @@
G_add_keyword(_("raster3d"));
G_add_keyword(_("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_standard_option(G_OPT_F_OUTPUT);
out->key = "dspf";
Modified: grass/trunk/raster3d/r3.null/main.c
===================================================================
--- grass/trunk/raster3d/r3.null/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster3d/r3.null/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -51,7 +51,7 @@
params.map->multiple = NO;
params.map->gisprompt = "old,grid3,3d-raster";
params.map->description =
- _("3d raster map for which to modify null values");
+ _("3D raster map for which to modify null values");
params.setNull = G_define_option();
params.setNull->key = "setnull";
Modified: grass/trunk/raster3d/r3.out.vtk/parameters.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/parameters.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster3d/r3.out.vtk/parameters.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -27,7 +27,7 @@
param.input = G_define_standard_option(G_OPT_R3_INPUTS);
param.input->required = NO;
param.input->description =
- _("RASTER3D map(s) to be converted to VTK-ASCII data format");
+ _("3D raster map(s) to be converted to VTK-ASCII data format");
param.output = G_define_standard_option(G_OPT_F_OUTPUT);
param.output->required = NO;
@@ -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();
@@ -118,13 +118,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");
param.scalell = G_define_flag();
param.scalell->key = 'l';
Modified: grass/trunk/raster3d/r3.showdspf/main_ogl.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/main_ogl.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/raster3d/r3.showdspf/main_ogl.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -120,7 +120,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/trunk/scripts/g.extension/g.extension.py
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/scripts/g.extension/g.extension.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -101,7 +101,7 @@
#%end
#%flag
#% key: i
-#% description: Don't install new extension, just compile it
+#% description: Do not install new extension, just compile it
#% guisection: Install
#%end
#%flag
Modified: grass/trunk/scripts/m.proj/m.proj.py
===================================================================
--- grass/trunk/scripts/m.proj/m.proj.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/scripts/m.proj/m.proj.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -35,7 +35,7 @@
#%end
#%option G_OPT_F_INPUT
#% label: Name of input coordinate file
-#% description: '-' to read from standard input
+#% description: '-' for standard input
#% required: no
#% guisection: Input coordinates
#%end
Modified: grass/trunk/scripts/r.fillnulls/r.fillnulls.py
===================================================================
--- grass/trunk/scripts/r.fillnulls/r.fillnulls.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/scripts/r.fillnulls/r.fillnulls.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -36,7 +36,7 @@
#%option
#% key: method
#% type: string
-#% description: Interpolation method
+#% description: Interpolation method to use
#% required: yes
#% options: bilinear,bicubic,rst
#% answer: rst
Modified: grass/trunk/scripts/r.in.wms/r.in.wms.py
===================================================================
--- grass/trunk/scripts/r.in.wms/r.in.wms.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/scripts/r.in.wms/r.in.wms.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -165,7 +165,7 @@
#%flag
#% key: o
-#% description: Don't request transparent data
+#% description: Do not request transparent data
#% guisection: Map style
#%end
Modified: grass/trunk/scripts/r.mask/r.mask.py
===================================================================
--- grass/trunk/scripts/r.mask/r.mask.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/scripts/r.mask/r.mask.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -32,7 +32,7 @@
#% key: maskcats
#% type: string
#% label: Raster values to use for mask
-#% description: format: 1 2 3 thru 7 *
+#% description: Format: 1 2 3 thru 7 *
#% answer: *
#% guisection: Raster
#%end
Modified: grass/trunk/temporal/t.info/t.info.py
===================================================================
--- grass/trunk/temporal/t.info/t.info.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.info/t.info.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -37,7 +37,7 @@
#%flag
#% key: g
-#% description: Print information in shell style
+#% description: Print in shell script style
#%end
#%flag
Modified: grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -110,7 +110,7 @@
#%flag
#% key: n
-#% description: Register empty maps in the output space time raster datasets, otherwise they will be deleted
+#% description: Register empty maps in the output space time raster dataset, otherwise they will be deleted
#%end
#%flag
Modified: grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -48,7 +48,7 @@
#%option
#% key: method
#% type: string
-#% description: Aggregate operation to be peformed on the raster maps
+#% description: Aggregate operation to be performed on the raster maps
#% required: yes
#% multiple: no
#% options: average,count,median,mode,minimum,min_raster,maximum,max_raster,stddev,range,sum,variance,diversity,slope,offset,detcoeff,quart1,quart3,perc90,quantile,skewness,kurtosis
Modified: grass/trunk/temporal/t.rast.colors/t.rast.colors.py
===================================================================
--- grass/trunk/temporal/t.rast.colors/t.rast.colors.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.rast.colors/t.rast.colors.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -55,7 +55,7 @@
#%flag
#% key: r
-#% description: Remove existing color tables
+#% description: Remove existing color table
#% guisection: Remove
#%end
Modified: grass/trunk/temporal/t.rast.import/t.rast.import.py
===================================================================
--- grass/trunk/temporal/t.rast.import/t.rast.import.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.rast.import/t.rast.import.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Import a space time raster dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -60,7 +60,7 @@
#%option
#% key: location
#% type: string
-#% description: Create a new location and import the data into it. Please do not run this module in parallel or interrupt it when a new location should be created.
+#% description: Create a new location and import the data into it. Do not run this module in parallel or interrupt it when a new location should be created
#% required: no
#% multiple: no
#%end
@@ -85,7 +85,6 @@
#% description: Override projection (use location's projection)
#%end
-
#%flag
#% key: c
#% description: Create the location specified by the "location" parameter and exit. Do not import the space time raster datasets.
Modified: grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Perform spatio-temporal mapcalc expressions on temporal sampled maps of space time raster datasets
-# COPYRIGHT: (C) 2012 by the GRASS Development Team
+# COPYRIGHT: (C) 2012-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
Modified: grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -146,7 +146,7 @@
output=output, overwrite=grass.overwrite())
if ret != 0:
- grass.fatal(_("Unable to create raster3d map <%s>" % output))
+ grass.fatal(_("Unable to create 3D raster map <%s>" % output))
grass.run_command("g.remove", rast=null_map)
Modified: grass/trunk/temporal/t.rast3d.extract/t.rast3d.extract.py
===================================================================
--- grass/trunk/temporal/t.rast3d.extract/t.rast3d.extract.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.rast3d.extract/t.rast3d.extract.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -5,7 +5,7 @@
# MODULE: t.rast3d.extract
# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Extract a subset of a space time raster3d dataset
+# PURPOSE: Extract a subset of a space time 3D raster dataset
# COPYRIGHT: (C) 2011 by the GRASS Development Team
#
# This program is free software under the GNU General Public
@@ -15,7 +15,7 @@
#############################################################################
#%module
-#% description: Extracts a subset of a space time raster3d dataset.
+#% description: Extracts a subset of a space time 3D raster dataset.
#% keywords: temporal
#% keywords: extract
#%end
@@ -29,7 +29,7 @@
#%option
#% key: expression
#% type: string
-#% description: The r3.mapcalc expression assigned to all extracted raster3d maps
+#% description: The r3.mapcalc expression assigned to all extracted 3D raster maps
#% required: no
#% multiple: no
#%end
@@ -40,7 +40,7 @@
#%option
#% key: base
#% type: string
-#% description: Base name of the new created raster3d maps
+#% description: Base name of the new created 3D raster maps
#% required: no
#% multiple: no
#%end
Modified: grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Perform r3.mapcalc expressions on maps of sampled space time raster3d datasets
-# COPYRIGHT: (C) 2012 by the GRASS Development Team
+# COPYRIGHT: (C) 2012-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -15,7 +15,7 @@
#############################################################################
#%module
-#% description: Performs r3.mapcalc expressions on maps of sampled space time raster3d datasets.
+#% description: Performs r3.mapcalc expressions on maps of sampled space time 3D raster datasets.
#% keywords: temporal
#% keywords: algebra
#%end
Modified: grass/trunk/temporal/t.sample/t.sample.py
===================================================================
--- grass/trunk/temporal/t.sample/t.sample.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.sample/t.sample.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -56,7 +56,7 @@
#%flag
#% key: s
-#% description: Check spatial overlap to perform spatio-temporal sampling
+#% description: Check spatial overlap
#%end
import grass.script as grass
Modified: grass/trunk/temporal/t.vect.import/t.vect.import.py
===================================================================
--- grass/trunk/temporal/t.vect.import/t.vect.import.py 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/temporal/t.vect.import/t.vect.import.py 2014-09-17 06:41:01 UTC (rev 62007)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Import a space time vector dataset archive file
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
Modified: grass/trunk/vector/v.buffer/main.c
===================================================================
--- grass/trunk/vector/v.buffer/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.buffer/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -296,7 +296,7 @@
nocaps_flag = G_define_flag();
nocaps_flag->key = 'c';
- nocaps_flag->description = _("Don't make caps at the ends of polylines");
+ nocaps_flag->description = _("Do not make caps at the ends of polylines");
cats_flag = G_define_flag();
cats_flag->key = 't';
Modified: grass/trunk/vector/v.clean/main.c
===================================================================
--- grass/trunk/vector/v.clean/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.clean/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -126,7 +126,7 @@
flag.no_build = G_define_flag();
flag.no_build->key = 'b';
flag.no_build->description =
- _("Don't build topology for the output vector");
+ _("Do not build topology for the output vector");
flag.combine = G_define_flag();
flag.combine->key = 'c';
Modified: grass/trunk/vector/v.colors/main.c
===================================================================
--- grass/trunk/vector/v.colors/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.colors/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -125,7 +125,7 @@
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.l = G_define_flag();
flag.l->key = 'l';
Modified: grass/trunk/vector/v.colors.out/main.c
===================================================================
--- grass/trunk/vector/v.colors.out/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.colors.out/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -64,7 +64,7 @@
opt.col = G_define_standard_option(G_OPT_DB_COLUMN);
opt.col->label = _("Name of attribute (numeric) column to which refer color rules");
- opt.col->description = _("If not given color rules are refered to categories");
+ opt.col->description = _("If not given, color rules refer to categories");
opt.col->guisection = _("Settings");
flag.p = G_define_flag();
Modified: grass/trunk/vector/v.edit/args.c
===================================================================
--- grass/trunk/vector/v.edit/args.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.edit/args.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -86,7 +86,7 @@
params->in->required = NO;
params->in->label = _("Name of file containing data in GRASS ASCII vector format");
params->in->description =
- _("\"-\" reads from standard input");
+ _("'-' for standard input");
params->in->guisection = _("Input");
params->move = G_define_option();
Modified: grass/trunk/vector/v.in.ascii/main.c
===================================================================
--- grass/trunk/vector/v.in.ascii/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.in.ascii/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -153,7 +153,7 @@
noheader_flag = G_define_flag();
noheader_flag->key = 'n';
noheader_flag->description =
- _("Don't expect a header when reading in standard format");
+ _("Do not expect a header when reading in standard format");
noheader_flag->guisection = _("Input format");
t_flag = G_define_flag();
Modified: grass/trunk/vector/v.in.lidar/main.c
===================================================================
--- grass/trunk/vector/v.in.lidar/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.in.lidar/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -227,7 +227,7 @@
no_import_flag->key = 'i';
no_import_flag->description =
_("Create the location specified by the \"location\" parameter and exit."
- " Do not import the vector file.");
+ " Do not import the vector data.");
no_import_flag->suppress_required = YES;
notopo_flag = G_define_standard_flag(G_FLG_V_TOPO);
Modified: grass/trunk/vector/v.label/main.c
===================================================================
--- grass/trunk/vector/v.label/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.label/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -153,7 +153,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/trunk/vector/v.lidar.growing/main.c
===================================================================
--- grass/trunk/vector/v.lidar.growing/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.lidar.growing/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -80,7 +80,7 @@
in_opt = G_define_standard_option(G_OPT_V_INPUT);
in_opt->description =
- _("Input vector (v.lidar.edgedetection output");
+ _("Input vector (v.lidar.edgedetection output)");
out_opt = G_define_standard_option(G_OPT_V_OUTPUT);
Modified: grass/trunk/vector/v.net/args.c
===================================================================
--- grass/trunk/vector/v.net/args.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net/args.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -76,7 +76,7 @@
opt->file->key = "file";
opt->file->label = _("Name of input file");
opt->file->description =
- _("Required for operation 'arcs'. '-' for standard input.");
+ _("Required for operation 'arcs' ('-' for standard input)");
opt->file->required = NO;
opt->cats_flag = G_define_flag();
Modified: grass/trunk/vector/v.net.alloc/main.c
===================================================================
--- grass/trunk/vector/v.net.alloc/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.alloc/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -1,21 +1,21 @@
/****************************************************************
*
- * MODULE: v.net.alloc
- *
- * AUTHOR(S): Radim Blazek
- * Stepan Turek <stepan.turek seznam.cz> (turns support)
- *
- * PURPOSE: Allocate subnets for nearest centers.
- *
- * COPYRIGHT: (C) 2001,2014 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
- * for details.
- *
- **************************************************************/
+ * MODULE: v.net.alloc
+ *
+ * AUTHOR(S): Radim Blazek
+ * Stepan Turek <stepan.turek seznam.cz> (turns support)
+ *
+ * PURPOSE: Allocate subnets for nearest centers
+ *
+ * COPYRIGHT: (C) 2001, 2014 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
+ * for details.
+ *
+ ****************************************************************/
#include <stdlib.h>
#include <string.h>
#include <time.h>
@@ -56,14 +56,16 @@
struct line_cats *Cats;
struct line_pnts *Points, *SPoints;
- G_gisinit(argv[0]);
+ /* initialize GIS environment */
+ G_gisinit(argv[0]); /* reads grass env, stores program name to G_program_name() */
+ /* initialize module */
module = G_define_module();
G_add_keyword(_("vector"));
G_add_keyword(_("network"));
G_add_keyword(_("allocation"));
module->label =
- _("Allocate subnets for nearest centers (direction from center).");
+ _("Allocates subnets for nearest centers (direction from center).");
module->description =
_("center node must be opened (costs >= 0). "
"Costs of center node are used in calculation");
@@ -90,7 +92,7 @@
type_opt->options = "line,boundary";
type_opt->answer = "line,boundary";
type_opt->required = YES;
- type_opt->description = _("Arc type");
+ type_opt->label = _("Arc type");
nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
nfield_opt->key = "nlayer";
@@ -102,23 +104,22 @@
afcol->key = "afcolumn";
afcol->type = TYPE_STRING;
afcol->required = NO;
- afcol->description =
- _("Arc forward/both direction(s) cost column (number)");
- afcol->guisection = _("Costs");
+ afcol->description = _("Arc forward/both direction(s) cost column (number)");
+ afcol->guisection = _("Cost");
abcol = G_define_option();
abcol->key = "abcolumn";
abcol->type = TYPE_STRING;
abcol->required = NO;
abcol->description = _("Arc backward direction cost column (number)");
- abcol->guisection = _("Costs");
+ abcol->guisection = _("Cost");
ncol = G_define_option();
ncol->key = "ncolumn";
ncol->type = TYPE_STRING;
ncol->required = NO;
ncol->description = _("Node cost column (number)");
- ncol->guisection = _("Costs");
+ ncol->guisection = _("Cost");
turntable_f = G_define_flag();
turntable_f->key = 't';
@@ -130,7 +131,7 @@
tfield_opt->answer = "3";
tfield_opt->label = _("Layer with turntable");
tfield_opt->description =
- _("Relevant only with -t flag.");
+ _("Relevant only with -t flag");
tfield_opt->guisection = _("Turntable");
tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
@@ -138,7 +139,7 @@
tucfield_opt->answer = "4";
tucfield_opt->label = _("Layer with unique categories used in turntable");
tucfield_opt->description =
- _("Relevant only with -t flag.");
+ _("Relevant only with -t flag");
tucfield_opt->guisection = _("Turntable");
geo_f = G_define_flag();
@@ -183,7 +184,6 @@
Vect_net_build_graph(&Map, type, afield, nfield, afcol->answer,
abcol->answer, ncol->answer, geo, 0);
-
nnodes = Vect_get_num_nodes(&Map);
nlines = Vect_get_num_lines(&Map);
Modified: grass/trunk/vector/v.net.centrality/main.c
===================================================================
--- grass/trunk/vector/v.net.centrality/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.centrality/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -180,7 +180,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/trunk/vector/v.net.components/main.c
===================================================================
--- grass/trunk/vector/v.net.components/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.components/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -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/trunk/vector/v.net.connectivity/main.c
===================================================================
--- grass/trunk/vector/v.net.connectivity/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.connectivity/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -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/trunk/vector/v.net.iso/main.c
===================================================================
--- grass/trunk/vector/v.net.iso/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.iso/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -7,14 +7,14 @@
* Stepan Turek <stepan.turek seznam.cz> (turns support)
*
* PURPOSE: Split net to bands between isolines.
- *
+ *
* COPYRIGHT: (C) 2001-2008,2014 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
* for details.
- *
+ *
**************************************************************/
#include <stdlib.h>
#include <string.h>
@@ -69,15 +69,15 @@
G_gisinit(argv[0]);
module = G_define_module();
- module->label = _("Splits net by cost isolines.");
G_add_keyword(_("vector"));
G_add_keyword(_("network"));
G_add_keyword(_("isolines"));
+ module->label = _("Splits net by cost isolines.");
module->description =
_
- ("Splits net to bands between cost isolines (direction from centre). "
- "Centre node must be opened (costs >= 0). "
- "Costs of centre node are used in calculation.");
+ ("Splits net to bands between cost isolines (direction from center). "
+ "Center node must be opened (costs >= 0). "
+ "Costs of center node are used in calculation.");
map = G_define_standard_option(G_OPT_V_INPUT);
output = G_define_standard_option(G_OPT_V_OUTPUT);
@@ -86,9 +86,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";
@@ -119,17 +119,17 @@
afcol->key = "afcolumn";
afcol->description =
_("Arc forward/both direction(s) cost column (number)");
- afcol->guisection = _("Costs");
+ afcol->guisection = _("Cost");
abcol = G_define_standard_option(G_OPT_DB_COLUMN);
abcol->key = "abcolumn";
abcol->description = _("Arc backward direction cost column (number)");
- abcol->guisection = _("Costs");
+ abcol->guisection = _("Cost");
ncol = G_define_standard_option(G_OPT_DB_COLUMN);
ncol->key = "ncolumn";
ncol->description = _("Node cost column (number)");
- ncol->guisection = _("Costs");
+ ncol->guisection = _("Cost");
turntable_f = G_define_flag();
turntable_f->key = 't';
@@ -141,7 +141,7 @@
tfield_opt->answer = "3";
tfield_opt->label = _("Layer with turntable");
tfield_opt->description =
- _("Relevant only with -t flag.");
+ _("Relevant only with -t flag");
tfield_opt->guisection = _("Turntable");
tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
@@ -149,7 +149,7 @@
tucfield_opt->answer = "4";
tucfield_opt->label = _("Layer with unique categories used in turntable");
tucfield_opt->description =
- _("Relevant only with -t flag.");
+ _("Relevant only with -t flag");
tucfield_opt->guisection = _("Turntable");
geo_f = G_define_flag();
@@ -160,6 +160,8 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
+ Vect_check_input_output_name(map->answer, output->answer, G_FATAL_EXIT);
+
Cats = Vect_new_cats_struct();
Points = Vect_new_line_struct();
SPoints = Vect_new_line_struct();
@@ -169,8 +171,6 @@
catlist = Vect_new_cat_list();
Vect_str_to_cat_list(term_opt->answer, catlist);
- Vect_check_input_output_name(map->answer, output->answer, G_FATAL_EXIT);
-
/* Iso costs */
aiso = 1;
iso = (double *)G_malloc(aiso * sizeof(double));
@@ -206,7 +206,6 @@
geo = 0;
Vect_set_open_level(2);
-
if (Vect_open_old(&Map, map->answer, "") < 0)
G_fatal_error(_("Unable to open vector map <%s>"), map->answer);
Modified: grass/trunk/vector/v.net.path/main.c
===================================================================
--- grass/trunk/vector/v.net.path/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.path/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -75,22 +75,22 @@
afcol->key = "afcolumn";
afcol->type = TYPE_STRING;
afcol->required = NO;
- afcol->description = _("Arc forward/both direction(s) cost column");
- afcol->guisection = _("Costs");
+ afcol->description = _("Arc forward/both direction(s) cost column (number)");
+ afcol->guisection = _("Cost");
abcol = G_define_option();
abcol->key = "abcolumn";
abcol->type = TYPE_STRING;
abcol->required = NO;
- abcol->description = _("Arc backward direction cost column");
- abcol->guisection = _("Costs");
+ abcol->description = _("Arc backward direction cost column (number)");
+ abcol->guisection = _("Cost");
ncol = G_define_option();
ncol->key = "ncolumn";
ncol->type = TYPE_STRING;
ncol->required = NO;
- ncol->description = _("Node cost column");
- ncol->guisection = _("Costs");
+ ncol->description = _("Node cost column (number)");
+ ncol->guisection = _("Cost");
max_dist = G_define_option();
max_dist->key = "dmax";
@@ -112,9 +112,9 @@
tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
tfield_opt->key = "tlayer";
tfield_opt->answer = "3";
- tfield_opt->label = _("Turntable layer");
+ tfield_opt->label = _("Layer with turntable");
tfield_opt->description =
- _("Relevant only with -t flag.");
+ _("Relevant only with -t flag");
tfield_opt->guisection = _("Turntable");
tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
@@ -122,7 +122,7 @@
tucfield_opt->answer = "4";
tucfield_opt->label = _("Layer with unique categories used in turntable");
tucfield_opt->description =
- _("Relevant only with -t flag.");
+ _("Relevant only with -t flag");
tucfield_opt->guisection = _("Turntable");
geo_f = G_define_flag();
Modified: grass/trunk/vector/v.net.salesman/main.c
===================================================================
--- grass/trunk/vector/v.net.salesman/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.salesman/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -5,17 +5,17 @@
*
* AUTHOR(S): Radim Blazek, Markus Metz
* Stepan Turek <stepan.turek seznam.cz> (turns support)
- *
+ *
* PURPOSE: Create a cycle connecting given nodes.
- *
+ *
* COPYRIGHT: (C) 2001-2011,2014 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
* for details.
- *
- **************************************************************/
+ *
+ ****************************************************************/
#include <stdlib.h>
#include <string.h>
#include <time.h>
@@ -128,8 +128,7 @@
G_add_keyword(_("network"));
G_add_keyword(_("salesman"));
module->label =
- _
- ("Creates a cycle connecting given nodes (Traveling salesman problem).");
+ _("Creates a cycle connecting given nodes (Traveling salesman problem).");
module->description =
_("Note that TSP is NP-hard, heuristic algorithm is used by "
"this module and created cycle may be sub optimal");
@@ -153,7 +152,7 @@
type_opt->options = "line,boundary";
type_opt->answer = "line,boundary";
type_opt->required = YES;
- type_opt->description = _("Arc type");
+ type_opt->label = _("Arc type");
nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
nfield_opt->key = "nlayer";
@@ -165,17 +164,16 @@
afcol->key = "afcolumn";
afcol->type = TYPE_STRING;
afcol->required = NO;
- afcol->description =
- _("Arc forward/both direction(s) cost column (number)");
- afcol->guisection = _("Costs");
+ afcol->description = _("Arc forward/both direction(s) cost column (number)");
+ afcol->guisection = _("Cost");
abcol = G_define_option();
abcol->key = "abcolumn";
abcol->type = TYPE_STRING;
+ abcol->required = NO;
abcol->required = NO;
- abcol->description =
- _("EXPERIMENTAL: Arc backward direction cost column (number)");
- abcol->guisection = _("Costs");
+ abcol->description = _("EXPERIMENTAL: Arc backward direction cost column (number)");
+ abcol->guisection = _("Cost");
turntable_f = G_define_flag();
turntable_f->key = 't';
@@ -186,14 +184,14 @@
tfield_opt->key = "tlayer";
tfield_opt->answer = "3";
tfield_opt->label = _("Layer with turntable");
- tfield_opt->description = _("Relevant only with -t flag.");
+ tfield_opt->description = _("Relevant only with -t flag");
tfield_opt->guisection = _("Turntable");
tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
tucfield_opt->key = "tuclayer";
tucfield_opt->answer = "4";
tucfield_opt->label = _("Layer with unique categories used in turntable");
- tucfield_opt->description = _("Relevant only with -t flag.");
+ tucfield_opt->description = _("Relevant only with -t flag");
tucfield_opt->guisection = _("Turntable");
seq = G_define_standard_option(G_OPT_F_OUTPUT);
Modified: grass/trunk/vector/v.net.steiner/main.c
===================================================================
--- grass/trunk/vector/v.net.steiner/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.steiner/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -388,7 +388,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/trunk/vector/v.net.visibility/main.c
===================================================================
--- grass/trunk/vector/v.net.visibility/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.net.visibility/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -64,7 +64,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/trunk/vector/v.out.postgis/args.c
===================================================================
--- grass/trunk/vector/v.out.postgis/args.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.out.postgis/args.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -63,7 +63,7 @@
flags->table = G_define_flag();
flags->table->key = 't';
flags->table->description =
- _("Don't export attribute table");
+ _("Do not export attribute table");
flags->table->guisection = _("Creation");
flags->topo = G_define_flag();
Modified: grass/trunk/vector/v.qcount/main.c
===================================================================
--- grass/trunk/vector/v.qcount/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.qcount/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -68,7 +68,7 @@
parm.output = G_define_standard_option(G_OPT_V_OUTPUT);
parm.output->required = NO;
parm.output->description =
- _("Name for output quadrant centres map (number of points is written as category)");
+ _("Name for output quadrant centers map (number of points is written as category)");
parm.n = G_define_option();
parm.n->key = "n";
Modified: grass/trunk/vector/v.rectify/main.c
===================================================================
--- grass/trunk/vector/v.rectify/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.rectify/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -99,7 +99,7 @@
val->required = NO;
val->options = "1-3";
val->answer = "1";
- val->description = _("Rectification polynom order (1-3)");
+ val->description = _("Rectification polynomial order (1-3)");
sep = G_define_standard_option(G_OPT_F_SEP);
sep->label = _("Field separator for RMS report");
Modified: grass/trunk/vector/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/v.surf.bspline/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.surf.bspline/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -188,7 +188,8 @@
memory_opt->type = TYPE_INTEGER;
memory_opt->required = NO;
memory_opt->answer = "300";
- memory_opt->description = _("Maximum memory to be used for raster output (in MB)");
+ memory_opt->label = _("Maximum memory to be used (in MB)");
+ memory_opt->description = _("Cache size for raster rows");
/*----------------------------------------------------------------*/
/* Parsing */
Modified: grass/trunk/vector/v.to.rast/main.c
===================================================================
--- grass/trunk/vector/v.to.rast/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.to.rast/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -113,7 +113,7 @@
memory->required = NO;
memory->multiple = NO;
memory->answer = "300";
- memory->label = _("Cache size (MiB)");
+ memory->label = _("Maximum memory to be used (in MB)");
memory->description = _("Cache size for raster rows");
dense_flag = G_define_flag();
Modified: grass/trunk/vector/v.transform/main.c
===================================================================
--- grass/trunk/vector/v.transform/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.transform/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -85,7 +85,7 @@
no_topo = G_define_flag();
no_topo->key = 'b';
- no_topo->description = _("Do not build topology for output");
+ no_topo->description = _("Do not build topology");
vold = G_define_standard_option(G_OPT_V_INPUT);
@@ -154,7 +154,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/trunk/vector/v.univar/main.c
===================================================================
--- grass/trunk/vector/v.univar/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.univar/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -132,7 +132,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]);
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.vol.rst/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -288,13 +288,13 @@
parm.devi = G_define_standard_option(G_OPT_V_OUTPUT);
parm.devi->key = "devi";
parm.devi->required = NO;
- parm.devi->description = _("Name for output deviations vector map");
+ parm.devi->description = _("Name for output deviations vector point map");
parm.devi->guisection = _("Outputs");
parm.cvdev = G_define_standard_option(G_OPT_V_OUTPUT);
parm.cvdev->key = "cvdev";
parm.cvdev->required = NO;
- parm.cvdev->description = _("Name for output cross-validation vector map");
+ parm.cvdev->description = _("Name for output cross-validation errors vector point map");
parm.cvdev->guisection = _("Outputs");
parm.maskmap = G_define_standard_option(G_OPT_R_INPUT);
@@ -394,7 +394,7 @@
parm.gcurv = G_define_standard_option(G_OPT_R3_OUTPUT);
parm.gcurv->key = "gcurv";
parm.gcurv->required = NO;
- parm.gcurv->description = _("Name for output gaussian curvature 3D raster map");
+ parm.gcurv->description = _("Name for output Gaussian curvature 3D raster map");
parm.gcurv->guisection = _("Outputs");
parm.mcurv = G_define_standard_option(G_OPT_R3_OUTPUT);
Modified: grass/trunk/vector/v.what/main.c
===================================================================
--- grass/trunk/vector/v.what/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.what/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -73,7 +73,7 @@
opt.coords = G_define_standard_option(G_OPT_M_COORDS);
opt.coords->required = YES;
opt.coords->label = _("Coordinates for query");
- opt.coords->description = _("\"-\" to read from standard input");
+ opt.coords->description = _("'-' for standard input");
opt.maxdist = G_define_option();
opt.maxdist->type = TYPE_DOUBLE;
Modified: grass/trunk/vector/v.what.rast3/main.c
===================================================================
--- grass/trunk/vector/v.what.rast3/main.c 2014-09-17 03:09:12 UTC (rev 62006)
+++ grass/trunk/vector/v.what.rast3/main.c 2014-09-17 06:41:01 UTC (rev 62007)
@@ -68,7 +68,7 @@
G_add_keyword(_("querying"));
G_add_keyword(_("attribute table"));
module->description =
- _("Uploads 3d raster values at positions of vector points to the table.");
+ _("Uploads 3D raster values at positions of vector points to the table.");
opt.vect = G_define_standard_option(G_OPT_V_MAP);
opt.vect->label =
@@ -78,7 +78,7 @@
opt.rast3d = G_define_standard_option(G_OPT_R3_MAP);
opt.rast3d->key = "raster3d";
- opt.rast3d->description = _("Name of existing 3d raster map to be queried");
+ opt.rast3d->description = _("Name of existing 3D raster map to be queried");
opt.col = G_define_standard_option(G_OPT_DB_COLUMN);
opt.col->required = YES;
@@ -130,7 +130,7 @@
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G_fatal_error(_("Error opening 3d raster map <%s>"), opt.rast3d->answer);
+ G_fatal_error(_("Error opening 3D raster map <%s>"), opt.rast3d->answer);
/* Check column type */
col_type = db_column_Ctype(driver, Fi->table, opt.col->answer);
More information about the grass-commit
mailing list