[GRASS-SVN] r32696 - in grass/branches/develbranch_6: db/base
db/db.login display/d.barscale display/d.erase display/d.info
display/d.legend display/d.linegraph display/d.text
display/d.text.freetype display/d.text.new
display/d.what.rast display/d.what.vect display/d.zoom
general/g.access general/g.dirseps general/g.mapset
general/g.message general/g.proj general/g.setproj
general/g.transform imagery/i.rectify lib/db/dbmi_base
lib/gis lib/gpde lib/proj ps/ps.map raster/r.bilinear
raster/r.cats raster/r.coin raster/r.colors raster/r.compress
raster/r.describe raster/r.digit raster/r.gwflow
raster/r.in.ascii raster/r.in.gdal raster/r.in.xyz
raster/r.info raster/r.le/r.le.setup raster/r.le/r.le.trace
raster/r.li/r.li.edgedensity raster/r.li/r.li.mps
raster/r.li/r.li.padcv raster/r.li/r.li.patchdensity
raster/r.li/r.li.patchnum raster/r.null raster/r.out.ascii
raster/r.out.mpeg raster/r.out.vrml raster/r.out.vtk
raster/r.profile raster/r.proj raster/r.proj.seg
raster/r.reclass raster/r.report raster/r.rescale
raster/r.rescale.eq raster/r.slope.aspect raster/r.sun
raster/r.sunmask raster/r.to.rast3 raster/r.to.rast3elev
raster/r.to.vect raster/r.topidx raster/r.transect
raster/r.univar2 raster/r.volume raster/r.walk raster/r.what
raster/simwe/r.sim.water raster/wildfire/r.ros
raster/wildfire/r.spread raster3d/base raster3d/r3.cross.rast
raster3d/r3.gwflow raster3d/r3.in.ascii raster3d/r3.mkdspf
raster3d/r3.out.vtk vector/lidar/v.lidar.correction
vector/lidar/v.lidar.edgedetection
vector/lidar/v.surf.bspline vector/v.buffer vector/v.build
vector/v.db.connect vector/v.digit vector/v.distance
vector/v.edit vector/v.external vector/v.extract
vector/v.generalize vector/v.hull vector/v.in.ascii
vector/v.in.db vector/v.in.ogr vector/v.info vector/v.kernel
vector/v.net vector/v.net.iso vector/v.net.salesman
vector/v.out.ascii vector/v.patch vector/v.random
vector/v.reclass vector/v.support vector/v.surf.rst
vector/v.univar vector/v.vol.rst vector/v.what vector/v.what.rast
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Aug 11 20:46:25 EDT 2008
Author: neteler
Date: 2008-08-11 20:45:32 -0400 (Mon, 11 Aug 2008)
New Revision: 32696
Modified:
grass/branches/develbranch_6/db/base/copy.c
grass/branches/develbranch_6/db/db.login/main.c
grass/branches/develbranch_6/display/d.barscale/main.c
grass/branches/develbranch_6/display/d.erase/main.c
grass/branches/develbranch_6/display/d.info/main.c
grass/branches/develbranch_6/display/d.legend/main.c
grass/branches/develbranch_6/display/d.linegraph/linegraph.c
grass/branches/develbranch_6/display/d.text.freetype/main.c
grass/branches/develbranch_6/display/d.text.new/main.c
grass/branches/develbranch_6/display/d.text/main.c
grass/branches/develbranch_6/display/d.what.rast/main.c
grass/branches/develbranch_6/display/d.what.vect/what.c
grass/branches/develbranch_6/display/d.zoom/zoom.c
grass/branches/develbranch_6/general/g.access/main.c
grass/branches/develbranch_6/general/g.dirseps/main.c
grass/branches/develbranch_6/general/g.mapset/main.c
grass/branches/develbranch_6/general/g.message/main.c
grass/branches/develbranch_6/general/g.proj/output.c
grass/branches/develbranch_6/general/g.setproj/main.c
grass/branches/develbranch_6/general/g.transform/main.c
grass/branches/develbranch_6/imagery/i.rectify/main.c
grass/branches/develbranch_6/lib/db/dbmi_base/legal_dbname.c
grass/branches/develbranch_6/lib/gis/get_cellhd.c
grass/branches/develbranch_6/lib/gis/get_datum_name.c
grass/branches/develbranch_6/lib/gis/get_ellipse.c
grass/branches/develbranch_6/lib/gis/get_projname.c
grass/branches/develbranch_6/lib/gis/parser.c
grass/branches/develbranch_6/lib/gpde/N_parse_options.c
grass/branches/develbranch_6/lib/proj/get_proj.c
grass/branches/develbranch_6/ps/ps.map/main.c
grass/branches/develbranch_6/raster/r.bilinear/main.c
grass/branches/develbranch_6/raster/r.cats/main.c
grass/branches/develbranch_6/raster/r.coin/inter.c
grass/branches/develbranch_6/raster/r.colors/main.c
grass/branches/develbranch_6/raster/r.colors/rules.c
grass/branches/develbranch_6/raster/r.compress/main.c
grass/branches/develbranch_6/raster/r.describe/main.c
grass/branches/develbranch_6/raster/r.digit/main.c
grass/branches/develbranch_6/raster/r.gwflow/main.c
grass/branches/develbranch_6/raster/r.in.ascii/main.c
grass/branches/develbranch_6/raster/r.in.gdal/main.c
grass/branches/develbranch_6/raster/r.in.xyz/main.c
grass/branches/develbranch_6/raster/r.info/main.c
grass/branches/develbranch_6/raster/r.le/r.le.setup/main.c
grass/branches/develbranch_6/raster/r.le/r.le.trace/main.c
grass/branches/develbranch_6/raster/r.li/r.li.edgedensity/edgedensity.c
grass/branches/develbranch_6/raster/r.li/r.li.mps/mps.c
grass/branches/develbranch_6/raster/r.li/r.li.padcv/padcv.c
grass/branches/develbranch_6/raster/r.li/r.li.patchdensity/main.c
grass/branches/develbranch_6/raster/r.li/r.li.patchnum/main.c
grass/branches/develbranch_6/raster/r.null/null.c
grass/branches/develbranch_6/raster/r.out.ascii/main.c
grass/branches/develbranch_6/raster/r.out.mpeg/main.c
grass/branches/develbranch_6/raster/r.out.vrml/main.c
grass/branches/develbranch_6/raster/r.out.vtk/parameters.c
grass/branches/develbranch_6/raster/r.profile/main.c
grass/branches/develbranch_6/raster/r.proj.seg/main.c
grass/branches/develbranch_6/raster/r.proj/main.c
grass/branches/develbranch_6/raster/r.reclass/main.c
grass/branches/develbranch_6/raster/r.report/parse.c
grass/branches/develbranch_6/raster/r.rescale.eq/main.c
grass/branches/develbranch_6/raster/r.rescale/main.c
grass/branches/develbranch_6/raster/r.slope.aspect/main.c
grass/branches/develbranch_6/raster/r.sun/main.c
grass/branches/develbranch_6/raster/r.sunmask/main.c
grass/branches/develbranch_6/raster/r.to.rast3/main.c
grass/branches/develbranch_6/raster/r.to.rast3elev/main.c
grass/branches/develbranch_6/raster/r.to.vect/main.c
grass/branches/develbranch_6/raster/r.topidx/main.c
grass/branches/develbranch_6/raster/r.transect/main.c
grass/branches/develbranch_6/raster/r.univar2/r.univar_main.c
grass/branches/develbranch_6/raster/r.univar2/r3.univar_main.c
grass/branches/develbranch_6/raster/r.volume/main.c
grass/branches/develbranch_6/raster/r.walk/main.c
grass/branches/develbranch_6/raster/r.what/main.c
grass/branches/develbranch_6/raster/simwe/r.sim.water/main.c
grass/branches/develbranch_6/raster/wildfire/r.ros/main.c
grass/branches/develbranch_6/raster/wildfire/r.spread/main.c
grass/branches/develbranch_6/raster3d/base/r3.info.main.c
grass/branches/develbranch_6/raster3d/r3.cross.rast/main.c
grass/branches/develbranch_6/raster3d/r3.gwflow/main.c
grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c
grass/branches/develbranch_6/raster3d/r3.mkdspf/main.c
grass/branches/develbranch_6/raster3d/r3.out.vtk/parameters.c
grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKData.c
grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKHead.c
grass/branches/develbranch_6/vector/lidar/v.lidar.correction/main.c
grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/main.c
grass/branches/develbranch_6/vector/lidar/v.surf.bspline/crosscorr.c
grass/branches/develbranch_6/vector/lidar/v.surf.bspline/main.c
grass/branches/develbranch_6/vector/v.buffer/main.c
grass/branches/develbranch_6/vector/v.build/main.c
grass/branches/develbranch_6/vector/v.db.connect/main.c
grass/branches/develbranch_6/vector/v.digit/main.c
grass/branches/develbranch_6/vector/v.distance/main.c
grass/branches/develbranch_6/vector/v.edit/args.c
grass/branches/develbranch_6/vector/v.external/main.c
grass/branches/develbranch_6/vector/v.extract/main.c
grass/branches/develbranch_6/vector/v.generalize/main.c
grass/branches/develbranch_6/vector/v.hull/main.c
grass/branches/develbranch_6/vector/v.in.ascii/in.c
grass/branches/develbranch_6/vector/v.in.db/main.c
grass/branches/develbranch_6/vector/v.in.ogr/main.c
grass/branches/develbranch_6/vector/v.info/main.c
grass/branches/develbranch_6/vector/v.kernel/main.c
grass/branches/develbranch_6/vector/v.net.iso/main.c
grass/branches/develbranch_6/vector/v.net.salesman/main.c
grass/branches/develbranch_6/vector/v.net/main.c
grass/branches/develbranch_6/vector/v.out.ascii/out.c
grass/branches/develbranch_6/vector/v.patch/main.c
grass/branches/develbranch_6/vector/v.random/main.c
grass/branches/develbranch_6/vector/v.reclass/main.c
grass/branches/develbranch_6/vector/v.support/main.c
grass/branches/develbranch_6/vector/v.surf.rst/main.c
grass/branches/develbranch_6/vector/v.univar/main.c
grass/branches/develbranch_6/vector/v.vol.rst/main.c
grass/branches/develbranch_6/vector/v.what.rast/main.c
grass/branches/develbranch_6/vector/v.what/what.c
Log:
Fix undesired line breaks in _(
Modified: grass/branches/develbranch_6/db/base/copy.c
===================================================================
--- grass/branches/develbranch_6/db/base/copy.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/db/base/copy.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -33,8 +33,7 @@
module = G_define_module();
module->keywords = _("database, SQL");
module->description =
- _
- ("Copy a table. Either 'from_table' (optionaly with 'where') can be used "
+ _("Copy a table. Either 'from_table' (optionaly with 'where') can be used "
"or 'select' option, but not 'from_table' and 'select' at the same time.");
from_driver = G_define_option();
@@ -97,8 +96,7 @@
select->type = TYPE_STRING;
select->required = NO;
select->description =
- _
- ("Full select statement (only, if 'from_table' and 'where' is not used), e.g.:\n"
+ _("Full select statement (only, if 'from_table' and 'where' is not used), e.g.:\n"
"\t\tSELECT dedek FROM starobince WHERE obec = 'Frimburg'");
if (G_parser(argc, argv))
Modified: grass/branches/develbranch_6/db/db.login/main.c
===================================================================
--- grass/branches/develbranch_6/db/db.login/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/db/db.login/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -80,8 +80,7 @@
#endif
do {
fprintf(stderr,
- _
- ("\nEnter database password for connection\n<%s:%s:user=%s>\n"),
+ _("\nEnter database password for connection\n<%s:%s:user=%s>\n"),
driver->answer, database->answer, user->answer);
fprintf(stderr, _("Hit RETURN to cancel request\n"));
fprintf(stderr, ">");
Modified: grass/branches/develbranch_6/display/d.barscale/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.barscale/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.barscale/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -86,8 +86,7 @@
opt1->answer = DEFAULT_BG_COLOR;
opt1->required = NO;
opt1->description =
- _
- ("Background color, either a standard GRASS color, R:G:B triplet, or \"none\"");
+ _("Background color, either a standard GRASS color, R:G:B triplet, or \"none\"");
opt1->gisprompt = GISPROMPT_COLOR;
opt2 = G_define_option();
@@ -107,8 +106,7 @@
opt3->options = "0-100";
opt3->required = NO;
opt3->description =
- _
- ("The screen coordinates for top-left corner of label ([0,0] is top-left of frame)");
+ _("The screen coordinates for top-left corner of label ([0,0] is top-left of frame)");
if (G_parser(argc, argv) < 0)
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/display/d.erase/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.erase/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.erase/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -31,8 +31,7 @@
module = G_define_module();
module->keywords = _("display");
module->description =
- _
- ("Erase the contents of the active display frame with user defined color");
+ _("Erase the contents of the active display frame with user defined color");
color = G_define_option();
color->key = "color";
@@ -40,8 +39,7 @@
color->required = NO;
color->answer = DEFAULT_BG_COLOR;
color->description =
- _
- ("Color to erase with, either a standard GRASS color or R:G:B triplet (separated by colons)");
+ _("Color to erase with, either a standard GRASS color or R:G:B triplet (separated by colons)");
color->gisprompt = GISPROMPT_COLOR;
eraseframe = G_define_flag();
Modified: grass/branches/develbranch_6/display/d.info/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.info/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.info/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -54,8 +54,7 @@
gflag = G_define_flag();
gflag->key = 'g';
gflag->description =
- _
- ("Display screen rectangle coordinates and resolution (west, east, north, south, ewres, nsres)");
+ _("Display screen rectangle coordinates and resolution (west, east, north, south, ewres, nsres)");
cflag = G_define_flag();
cflag->key = 'c';
Modified: grass/branches/develbranch_6/display/d.legend/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.legend/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.legend/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -131,8 +131,7 @@
opt7->required = NO;
opt7->options = "0-100";
opt7->label =
- _
- ("Placement as percentage of screen coordinates (0,0 is lower left)");
+ _("Placement as percentage of screen coordinates (0,0 is lower left)");
opt7->description = opt7->key_desc;
opt7->answer = NULL;
Modified: grass/branches/develbranch_6/display/d.linegraph/linegraph.c
===================================================================
--- grass/branches/develbranch_6/display/d.linegraph/linegraph.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.linegraph/linegraph.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -112,8 +112,7 @@
module = G_define_module();
module->keywords = _("display");
module->description =
- _
- ("Generates and displays simple line graphs in the active graphics monitor display frame.");
+ _("Generates and displays simple line graphs in the active graphics monitor display frame.");
x_opt = G_define_option();
x_opt->key = "x_file";
Modified: grass/branches/develbranch_6/display/d.text/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.text/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.text/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -65,8 +65,7 @@
module = G_define_module();
module->keywords = _("display");
module->description =
- _
- ("Draws text in the active display frame on the graphics monitor using the current font.");
+ _("Draws text in the active display frame on the graphics monitor using the current font.");
opt1 = G_define_option();
opt1->key = "size";
@@ -101,8 +100,7 @@
opt4->options = "0-100";
opt4->required = NO;
opt4->description =
- _
- ("Screen position at which text will begin to be drawn (percentage, [0,0] is lower left)");
+ _("Screen position at which text will begin to be drawn (percentage, [0,0] is lower left)");
opt5 = G_define_option();
opt5->key = "rotation";
Modified: grass/branches/develbranch_6/display/d.text.freetype/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.text.freetype/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.text.freetype/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -137,8 +137,7 @@
module = G_define_module();
module->keywords = _("display");
module->description =
- _
- ("Draws text in the graphics monitor's active display frame using TrueType fonts.");
+ _("Draws text in the graphics monitor's active display frame using TrueType fonts.");
param.text = G_define_option();
param.text->key = "text";
Modified: grass/branches/develbranch_6/display/d.text.new/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.text.new/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.text.new/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -138,8 +138,7 @@
module = G_define_module();
module->keywords = _("display");
module->description =
- _
- ("Draws text in the active display frame on the graphics monitor using the current font.");
+ _("Draws text in the active display frame on the graphics monitor using the current font.");
opt.text = G_define_option();
opt.text->key = "text";
@@ -179,8 +178,7 @@
opt.at->type = TYPE_DOUBLE;
opt.at->required = NO;
opt.at->description =
- _
- ("Screen position at which text will begin to be drawn (percentage, [0,0] is lower left)");
+ _("Screen position at which text will begin to be drawn (percentage, [0,0] is lower left)");
opt.align = G_define_option();
opt.align->key = "align";
@@ -392,8 +390,7 @@
if (isatty(0))
fprintf(stdout,
- _
- ("\nPlease enter text instructions. Enter EOF (ctrl-d) on last line to quit\n"));
+ _("\nPlease enter text instructions. Enter EOF (ctrl-d) on last line to quit\n"));
cmd_file = G_tempfile();
if ((cmd_fp = fopen(cmd_file, "w")) == NULL)
Modified: grass/branches/develbranch_6/display/d.what.rast/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.what.rast/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.what.rast/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -93,8 +93,7 @@
colrow = G_define_flag();
colrow->key = 'c';
colrow->description =
- _
- ("Print out col/row for the entire map in grid resolution of the region");
+ _("Print out col/row for the entire map in grid resolution of the region");
if (!rast)
opt1->required = YES;
Modified: grass/branches/develbranch_6/display/d.what.vect/what.c
===================================================================
--- grass/branches/develbranch_6/display/d.what.vect/what.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.what.vect/what.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -248,8 +248,7 @@
Vect_get_node_coor(&(Map[i]), node[n], &nx, &ny, &nz);
fprintf(stdout,
- _
- (" Node[%d]: %d Number of lines: %d Coordinates: %.6f, %.6f, %.6f\n"),
+ _(" Node[%d]: %d Number of lines: %d Coordinates: %.6f, %.6f, %.6f\n"),
n, node[n], nnlines, nx, ny, nz);
for (nli = 0; nli < nnlines; nli++) {
@@ -387,13 +386,11 @@
((sq_meters * 10.763649) / 43560.) / 640.);
if (notty) {
fprintf(stderr,
- _
- ("Size - Sq Meters: %.3f\t\tHectares: %.3f\n"),
+ _("Size - Sq Meters: %.3f\t\tHectares: %.3f\n"),
sq_meters, (sq_meters / 10000.));
fprintf(stderr,
- _
- (" Acres: %.3f\t\tSq Miles: %.4f\n"),
+ _(" Acres: %.3f\t\tSq Miles: %.4f\n"),
((sq_meters * 10.763649) / 43560.),
((sq_meters * 10.763649) / 43560.) / 640.);
}
@@ -447,8 +444,7 @@
if (txt) {
fprintf(stdout,
- _
- ("driver: %s\ndatabase: %s\ntable: %s\nkey column: %s\n"),
+ _("driver: %s\ndatabase: %s\ntable: %s\nkey column: %s\n"),
Fi->driver, Fi->database, Fi->table,
Fi->key);
}
Modified: grass/branches/develbranch_6/display/d.zoom/zoom.c
===================================================================
--- grass/branches/develbranch_6/display/d.zoom/zoom.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/display/d.zoom/zoom.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -39,8 +39,7 @@
if (!quiet) {
fprintf(stderr, _("This region now saved as current region.\n\n"));
fprintf(stderr,
- _
- ("Note: run 'd.erase' for the new region to affect the graphics.\n"));
+ _("Note: run 'd.erase' for the new region to affect the graphics.\n"));
}
#endif
return (0);
Modified: grass/branches/develbranch_6/general/g.access/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.access/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/general/g.access/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -36,8 +36,7 @@
module = G_define_module();
module->keywords = _("general");
module->description =
- _
- ("Controls access to the current mapset for other users on the system.");
+ _("Controls access to the current mapset for other users on the system.");
group_opt = G_define_option();
group_opt->key = "group";
Modified: grass/branches/develbranch_6/general/g.dirseps/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.dirseps/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/general/g.dirseps/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -32,8 +32,7 @@
module = G_define_module();
module->keywords = "general";
module->label =
- _
- ("Internal GRASS utility for converting directory separator characters.");
+ _("Internal GRASS utility for converting directory separator characters.");
module->description =
"Converts any directory separator characters in "
"the input string to or from native host format, and writes the changed "
Modified: grass/branches/develbranch_6/general/g.mapset/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.mapset/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/general/g.mapset/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -68,8 +68,7 @@
gisdbase_opt->required = NO;
gisdbase_opt->multiple = NO;
gisdbase_opt->description =
- _
- ("New GISDBASE (full path to the directory where the new location is)");
+ _("New GISDBASE (full path to the directory where the new location is)");
f_add = G_define_flag();
f_add->key = 'c';
Modified: grass/branches/develbranch_6/general/g.message/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.message/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/general/g.message/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -33,8 +33,7 @@
module->label =
_("Prints a message, warning, or fatal error the GRASS way.");
module->description =
- _
- ("This module should be used in scripts for messages served to user.");
+ _("This module should be used in scripts for messages served to user.");
warning = G_define_flag();
warning->key = 'w';
Modified: grass/branches/develbranch_6/general/g.proj/output.c
===================================================================
--- grass/branches/develbranch_6/general/g.proj/output.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/general/g.proj/output.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -187,8 +187,7 @@
if (interactive) {
/* Warn as in g.setproj before overwriting current location */
fprintf(stderr,
- _
- ("\n\nWARNING! A projection file already exists for this location\n"));
+ _("\n\nWARNING! A projection file already exists for this location\n"));
fprintf(stderr,
"\nThis file contains all the parameters for the\nlocation's projection: %s\n",
G_find_key_value("proj", old_projinfo));
Modified: grass/branches/develbranch_6/general/g.setproj/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.setproj/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/general/g.setproj/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -607,8 +607,7 @@
}
while (1) {
fprintf(stderr,
- _
- ("Enter conversion factor from %s to meters: "),
+ _("Enter conversion factor from %s to meters: "),
answer);
G_gets(answer2);
G_strip(answer2);
@@ -642,8 +641,7 @@
if (G__put_window(&cellhd, "", "DEFAULT_WIND") < 0)
G_fatal_error(_("Unable to write to DEFAULT_WIND region file"));
fprintf(stderr,
- _
- ("\nProjection information has been recorded for this location\n\n"));
+ _("\nProjection information has been recorded for this location\n\n"));
if ((old_zone != zone) | (old_proj != cellhd.proj)) {
G_message(_("The geographic region information in WIND is now obsolete"));
G_message(_("Run g.region -d to update it"));
Modified: grass/branches/develbranch_6/general/g.transform/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.transform/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/general/g.transform/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -248,8 +248,7 @@
module = G_define_module();
module->keywords = _("general, transformation, GCP");
module->description =
- _
- ("Computes a coordinate transformation based on the control points.");
+ _("Computes a coordinate transformation based on the control points.");
grp = G_define_standard_option(G_OPT_I_GROUP);
Modified: grass/branches/develbranch_6/imagery/i.rectify/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.rectify/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/imagery/i.rectify/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -80,8 +80,7 @@
c = G_define_flag();
c->key = 'c';
c->description =
- _
- ("Use curr. region settings in target location (def.=calculate smallest area)");
+ _("Use curr. region settings in target location (def.=calculate smallest area)");
a = G_define_flag();
a->key = 'a';
Modified: grass/branches/develbranch_6/lib/db/dbmi_base/legal_dbname.c
===================================================================
--- grass/branches/develbranch_6/lib/db/dbmi_base/legal_dbname.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/lib/db/dbmi_base/legal_dbname.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -22,8 +22,7 @@
if (*s == '.' || *s == 0) {
fprintf(stderr,
- _
- ("Illegal table map name <%s>. May not contain '.' or 'NULL'.\n"),
+ _("Illegal table map name <%s>. May not contain '.' or 'NULL'.\n"),
buf);
return DB_FAILED;
}
@@ -41,8 +40,7 @@
((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z') ||
(*s >= '0' && *s <= '9') || *s == '_' || *s == '@')) {
fprintf(stderr,
- _
- ("Illegal table map name <%s>. Character <%c> not allowed.\n"),
+ _("Illegal table map name <%s>. Character <%c> not allowed.\n"),
buf, *s);
return DB_FAILED;
}
Modified: grass/branches/develbranch_6/lib/gis/get_cellhd.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/get_cellhd.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/lib/gis/get_cellhd.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -102,8 +102,7 @@
tail = buf + strlen(buf);
if (is_reclass) {
sprintf(tail,
- _
- (" It is a reclass of raster map <%s@%s> whose header file is invalid."),
+ _(" It is a reclass of raster map <%s@%s> whose header file is invalid."),
real_name, real_mapset);
}
else
Modified: grass/branches/develbranch_6/lib/gis/get_datum_name.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/get_datum_name.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/lib/gis/get_datum_name.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -54,8 +54,7 @@
fprintf(stderr,
_("Enter 'list' for the list of available datums\n"));
fprintf(stderr,
- _
- ("or 'custom' if you wish to enter custom parameters\n"));
+ _("or 'custom' if you wish to enter custom parameters\n"));
fprintf(stderr, _("Hit RETURN to cancel request\n"));
fprintf(stderr, ">");
} while (!G_gets(answer));
Modified: grass/branches/develbranch_6/lib/gis/get_ellipse.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/get_ellipse.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/lib/gis/get_ellipse.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -330,11 +330,9 @@
(fatal ? G_fatal_error : G_warning) ((err > 1)
?
- _
- ("Lines%s of ellipsoid table file <%s> are invalid")
+ _("Lines%s of ellipsoid table file <%s> are invalid")
:
- _
- ("Line%s of ellipsoid table file <%s> is invalid"),
+ _("Line%s of ellipsoid table file <%s> is invalid"),
badlines, file);
return 0;
Modified: grass/branches/develbranch_6/lib/gis/get_projname.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/get_projname.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/lib/gis/get_projname.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -48,8 +48,7 @@
do {
fprintf(stderr, _("\n\nPlease specify projection name\n"));
fprintf(stderr,
- _
- ("Enter 'list' for the list of available projections\n"));
+ _("Enter 'list' for the list of available projections\n"));
fprintf(stderr, _("Hit RETURN to cancel request\n"));
fprintf(stderr, ">");
} while (!G_gets(answer));
Modified: grass/branches/develbranch_6/lib/gis/parser.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/parser.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/lib/gis/parser.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -2387,8 +2387,7 @@
while (opt != NULL) {
if (opt->required && opt->answer == NULL) {
fprintf(stderr,
- _
- ("\nERROR: Required parameter <%s> not set:\n (%s).\n"),
+ _("\nERROR: Required parameter <%s> not set:\n (%s).\n"),
opt->key, opt->description);
err++;
}
@@ -2483,8 +2482,7 @@
/* if not correct multiple of items */
if (n % n_commas) {
fprintf(stderr,
- _
- ("\nERROR: option <%s> must be provided in multiples of %d\n"),
+ _("\nERROR: option <%s> must be provided in multiples of %d\n"),
opt->key, n_commas);
fprintf(stderr, _(" You provided %d items:\n"), n);
fprintf(stderr, " %s\n", opt->answer);
Modified: grass/branches/develbranch_6/lib/gpde/N_parse_options.c
===================================================================
--- grass/branches/develbranch_6/lib/gpde/N_parse_options.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/lib/gpde/N_parse_options.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -55,8 +55,7 @@
Opt->answer = "cg";
Opt->options = "gauss,lu,cholesky,jacobi,sor,cg,bicgstab,pcg";
Opt->description =
- _
- ("The type of solver which should solve the symmetric linear equation system");
+ _("The type of solver which should solve the symmetric linear equation system");
break;
/*solver for unsymmetric linear equation systems */
case N_OPT_SOLVER_UNSYMM:
@@ -67,8 +66,7 @@
Opt->answer = "bicgstab";
Opt->options = "gauss,lu,jacobi,sor,bicgstab";
Opt->description =
- _
- ("The type of solver which should solve the linear equation system");
+ _("The type of solver which should solve the linear equation system");
break;
case N_OPT_MAX_ITERATIONS:
Opt->key = "maxit";
@@ -76,8 +74,7 @@
Opt->required = NO;
Opt->answer = "100000";
Opt->description =
- _
- ("Maximum number of iteration used to solver the linear equation system");
+ _("Maximum number of iteration used to solver the linear equation system");
break;
case N_OPT_ITERATION_ERROR:
Opt->key = "error";
@@ -85,8 +82,7 @@
Opt->required = NO;
Opt->answer = "0.0000000001";
Opt->description =
- _
- ("Error break criteria for iterative solvers (jacobi, sor, cg or bicgstab)");
+ _("Error break criteria for iterative solvers (jacobi, sor, cg or bicgstab)");
break;
case N_OPT_SOR_VALUE:
Opt->key = "relax";
@@ -94,8 +90,7 @@
Opt->required = NO;
Opt->answer = "1";
Opt->description =
- _
- ("The relaxation parameter used by the jacobi and sor solver for speedup or stabilizing");
+ _("The relaxation parameter used by the jacobi and sor solver for speedup or stabilizing");
break;
case N_OPT_CALC_TIME:
Opt->key = "dt";
Modified: grass/branches/develbranch_6/lib/proj/get_proj.c
===================================================================
--- grass/branches/develbranch_6/lib/proj/get_proj.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/lib/proj/get_proj.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -227,8 +227,7 @@
if (!(pj = pj_init(nopt1, opt_in))) {
strcpy(buffa,
- _
- ("Unable to initialise PROJ.4 with the following parameter list:"));
+ _("Unable to initialise PROJ.4 with the following parameter list:"));
for (i = 0; i < nopt1; i++) {
char err[50];
Modified: grass/branches/develbranch_6/ps/ps.map/main.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/ps/ps.map/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -107,8 +107,7 @@
pflag = G_define_flag();
pflag->key = 'p';
pflag->description =
- _
- ("List paper formats ( name width height left right top bottom(margin) )");
+ _("List paper formats ( name width height left right top bottom(margin) )");
eflag = G_define_flag();
eflag->key = 'e';
@@ -119,8 +118,7 @@
input_file->key = "input";
input_file->type = TYPE_STRING;
input_file->description =
- _
- ("File containing mapping instructions (or use input=- to enter from keyboard)");
+ _("File containing mapping instructions (or use input=- to enter from keyboard)");
input_file->gisprompt = "old_file,file,input";
input_file->required = NO;
@@ -136,8 +134,7 @@
map_scale->key_desc = "mapscale";
map_scale->type = TYPE_STRING;
map_scale->description =
- _
- ("Scale of the output map, e.g. 1:25000 (default: Auto-sized to fit page)");
+ _("Scale of the output map, e.g. 1:25000 (default: Auto-sized to fit page)");
copies = G_define_option();
copies->key = "copies";
Modified: grass/branches/develbranch_6/raster/r.bilinear/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.bilinear/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.bilinear/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -51,16 +51,14 @@
northoff->key = "north";
northoff->type = TYPE_DOUBLE;
northoff->description =
- _
- ("Specific input value to be assigned to the north and/or south poles for longitude-latitude grids");
+ _("Specific input value to be assigned to the north and/or south poles for longitude-latitude grids");
northoff->required = NO;
eastoff = G_define_option();
eastoff->key = "east";
eastoff->type = TYPE_DOUBLE;
eastoff->description =
- _
- ("Specific input value to be assigned to the north and/or south poles for longitude-latitude grids");
+ _("Specific input value to be assigned to the north and/or south poles for longitude-latitude grids");
eastoff->required = NO;
if (G_parser(argc, argv))
Modified: grass/branches/develbranch_6/raster/r.cats/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.cats/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.cats/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -81,8 +81,7 @@
parm.file->key = "rules";
parm.file->required = NO;
parm.file->description =
- _
- ("File containing category label rules (or \"-\" to read from stdin)");
+ _("File containing category label rules (or \"-\" to read from stdin)");
parm.fmt_str = G_define_option();
parm.fmt_str->key = "format";
Modified: grass/branches/develbranch_6/raster/r.coin/inter.c
===================================================================
--- grass/branches/develbranch_6/raster/r.coin/inter.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.coin/inter.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -93,8 +93,7 @@
while (1) {
fprintf(stderr,
- _
- ("Do you wish to save this report in a file? (y/n) [n] "));
+ _("Do you wish to save this report in a file? (y/n) [n] "));
*ans = 0;
if (!G_gets(ans))
continue;
@@ -116,8 +115,7 @@
while (1) {
*ans = 0;
fprintf(stderr,
- _
- ("Do you wish to print this report (requires Unix lpr command)? (y/n) [n] "));
+ _("Do you wish to print this report (requires Unix lpr command)? (y/n) [n] "));
if (!G_gets(ans))
continue;
G_strip(ans);
Modified: grass/branches/develbranch_6/raster/r.colors/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.colors/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.colors/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -125,8 +125,7 @@
module = G_define_module();
module->keywords = _("raster, color table");
module->description =
- _
- ("Creates/modifies the color table associated with a raster map layer.");
+ _("Creates/modifies the color table associated with a raster map layer.");
opt.map = G_define_standard_option(G_OPT_R_MAP);
opt.map->required = NO;
Modified: grass/branches/develbranch_6/raster/r.colors/rules.c
===================================================================
--- grass/branches/develbranch_6/raster/r.colors/rules.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.colors/rules.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -39,8 +39,7 @@
if (isatty(fileno(fp))) {
fprintf(stderr,
- _
- ("Enter rules, \"end\" when done, \"help\" if you need it.\n"));
+ _("Enter rules, \"end\" when done, \"help\" if you need it.\n"));
if (is_fp) {
char minstr[64], maxstr[64];
Modified: grass/branches/develbranch_6/raster/r.compress/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.compress/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.compress/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -120,11 +120,9 @@
if (G_is_reclass(name, G_mapset(), rname, rmapset) > 0) {
G_warning(uncompress
?
- _
- ("[%s] is a reclass file of map <%s> in mapset <%s> - can't uncompress")
+ _("[%s] is a reclass file of map <%s> in mapset <%s> - can't uncompress")
:
- _
- ("[%s] is a reclass file of map <%s> in mapset <%s> - can't compress"),
+ _("[%s] is a reclass file of map <%s> in mapset <%s> - can't compress"),
name, rname, rmapset);
return 1;
}
Modified: grass/branches/develbranch_6/raster/r.describe/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.describe/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.describe/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -58,8 +58,7 @@
module = G_define_module();
module->keywords = _("raster");
module->description =
- _
- ("Prints terse list of category values found in a raster map layer.");
+ _("Prints terse list of category values found in a raster map layer.");
/* define different options */
option.map = G_define_standard_option(G_OPT_R_MAP);
Modified: grass/branches/develbranch_6/raster/r.digit/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.digit/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.digit/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -44,8 +44,7 @@
module = G_define_module();
module->keywords = _("raster");
module->description =
- _
- ("Interactive tool used to draw and save vector features on a graphics"
+ _("Interactive tool used to draw and save vector features on a graphics"
" monitor using a pointing device (mouse) and save to a raster map.");
output = G_define_standard_option(G_OPT_R_OUTPUT);
@@ -54,8 +53,7 @@
bgcmd->key = "bgcmd";
bgcmd->type = TYPE_STRING;
bgcmd->description =
- _
- ("Display commands to be used for canvas backdrop (separated by ';')");
+ _("Display commands to be used for canvas backdrop (separated by ';')");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/raster/r.gwflow/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.gwflow/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.gwflow/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -222,8 +222,7 @@
module = G_define_module();
module->keywords = _("raster");
module->description =
- _
- ("Numerical calculation program for transient, confined and unconfined groundwater flow in two dimensions.");
+ _("Numerical calculation program for transient, confined and unconfined groundwater flow in two dimensions.");
/* Get parameters from user */
set_params();
Modified: grass/branches/develbranch_6/raster/r.in.ascii/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.ascii/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.in.ascii/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -71,8 +71,7 @@
parm.input = G_define_standard_option(G_OPT_R_INPUT);
parm.input->description =
- _
- ("ASCII raster file to be imported. If not given reads from standard input");
+ _("ASCII raster file to be imported. If not given reads from standard input");
parm.input->gisprompt = "old_file,file,input";
parm.input->required = NO;
Modified: grass/branches/develbranch_6/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.gdal/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.in.gdal/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -78,8 +78,7 @@
module = G_define_module();
module->keywords = _("raster, import");
module->description =
- _
- ("Import GDAL supported raster file into a binary raster map layer.");
+ _("Import GDAL supported raster file into a binary raster map layer.");
/* -------------------------------------------------------------------- */
/* Setup and fetch parameters. */
@@ -396,12 +395,10 @@
cellhd.proj, cellhd.zone);
}
strcat(error_msg,
- _
- ("\nYou can use the -o flag to r.in.gdal to override this check and "
+ _("\nYou can use the -o flag to r.in.gdal to override this check and "
"use the location definition for the dataset.\n"));
strcat(error_msg,
- _
- ("Consider generating a new location from the input dataset using "
+ _("Consider generating a new location from the input dataset using "
"the 'location' parameter.\n"));
G_fatal_error(error_msg);
}
@@ -522,8 +519,7 @@
if (GDALGetGCPProjection(hDS) != NULL
&& strlen(GDALGetGCPProjection(hDS)) > 0) {
G_message("%s:\n%s",
- _
- ("GCPs have the following OpenGIS WKT Coordinate System:"),
+ _("GCPs have the following OpenGIS WKT Coordinate System:"),
GDALGetGCPProjection(hDS));
}
Modified: grass/branches/develbranch_6/raster/r.in.xyz/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.xyz/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.in.xyz/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -155,8 +155,7 @@
module = G_define_module();
module->keywords = _("raster, import, LIDAR");
module->description =
- _
- ("Create a raster map from an assemblage of many coordinates using univariate statistics.");
+ _("Create a raster map from an assemblage of many coordinates using univariate statistics.");
input_opt = G_define_standard_option(G_OPT_F_INPUT);
input_opt->description =
@@ -246,8 +245,7 @@
trim_opt->required = NO;
trim_opt->options = "0-50";
trim_opt->description =
- _
- ("Discard <trim> percent of the smallest and <trim> percent of the largest observations");
+ _("Discard <trim> percent of the smallest and <trim> percent of the largest observations");
trim_opt->guisection = _("Statistic");
scan_flag = G_define_flag();
Modified: grass/branches/develbranch_6/raster/r.info/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.info/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.info/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -108,8 +108,7 @@
timestampflag = G_define_flag();
timestampflag->key = 'p';
timestampflag->description =
- _
- ("Print raster map timestamp (day.month.year hour:minute:seconds) only");
+ _("Print raster map timestamp (day.month.year hour:minute:seconds) only");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/raster/r.le/r.le.setup/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.le/r.le.setup/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.le/r.le.setup/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -60,8 +60,7 @@
module = G_define_module();
module->keywords = _("raster");
module->description =
- _
- ("Interactive tool used to setup the sampling and analysis framework "
+ _("Interactive tool used to setup the sampling and analysis framework "
"that will be used by the other r.le programs.");
input = G_define_standard_option(G_OPT_R_MAP);
Modified: grass/branches/develbranch_6/raster/r.le/r.le.trace/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.le/r.le.trace/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.le/r.le.trace/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -56,8 +56,7 @@
module = G_define_module();
module->keywords = _("raster");
module->description =
- _
- ("Displays the boundary of each r.le patch and shows how the boundary "
+ _("Displays the boundary of each r.le patch and shows how the boundary "
"is traced, displays the attribute, size, perimeter and shape "
"indices for each patch and saves the data in an output file.");
Modified: grass/branches/develbranch_6/raster/r.li/r.li.edgedensity/edgedensity.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.edgedensity/edgedensity.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.li/r.li.edgedensity/edgedensity.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -35,8 +35,7 @@
G_gisinit(argv[0]);
module = G_define_module();
module->description =
- _
- ("Calculates edge density index on a raster map, using a 4 neighbour algorithm");
+ _("Calculates edge density index on a raster map, using a 4 neighbour algorithm");
module->keywords = _("raster, landscape structure analysis, patch index");
/* define options */
Modified: grass/branches/develbranch_6/raster/r.li/r.li.mps/mps.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.mps/mps.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.li/r.li.mps/mps.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -37,8 +37,7 @@
G_gisinit(argv[0]);
module = G_define_module();
module->description =
- _
- ("Calculates mean patch size index on a raster map, using a 4 neighbour algorithm");
+ _("Calculates mean patch size index on a raster map, using a 4 neighbour algorithm");
module->keywords = _("raster, landscape structure analysis, patch index");
/* define options */
Modified: grass/branches/develbranch_6/raster/r.li/r.li.padcv/padcv.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.padcv/padcv.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.li/r.li.padcv/padcv.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -34,8 +34,7 @@
G_gisinit(argv[0]);
module = G_define_module();
module->description =
- _
- ("Calculates coefficient of variation of patch area on a raster map");
+ _("Calculates coefficient of variation of patch area on a raster map");
module->keywords = _("raster, landscape structure analysis, patch index");
/* define options */
Modified: grass/branches/develbranch_6/raster/r.li/r.li.patchdensity/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.patchdensity/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.li/r.li.patchdensity/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -29,8 +29,7 @@
G_gisinit(argv[0]);
module = G_define_module();
module->description =
- _
- ("Calculates patch density index on a raster map, using a 4 neighbour algorithm");
+ _("Calculates patch density index on a raster map, using a 4 neighbour algorithm");
module->keywords = _("raster, landscape structure analysis, patch index");
/* define options */
Modified: grass/branches/develbranch_6/raster/r.li/r.li.patchnum/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.patchnum/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.li/r.li.patchnum/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -30,8 +30,7 @@
G_gisinit(argv[0]);
module = G_define_module();
module->description =
- _
- ("Calculates patch number index on a raster map, using a 4 neighbour algorithm.");
+ _("Calculates patch number index on a raster map, using a 4 neighbour algorithm.");
module->keywords = _("raster, landscape structure analysis, patch index");
/* define options */
Modified: grass/branches/develbranch_6/raster/r.null/null.c
===================================================================
--- grass/branches/develbranch_6/raster/r.null/null.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.null/null.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -79,8 +79,7 @@
flags.n = G_define_flag();
flags.n->key = 'n';
flags.n->description =
- _
- ("Only do the work if the map doesn't have a NULL-value bitmap file");
+ _("Only do the work if the map doesn't have a NULL-value bitmap file");
flags.c = G_define_flag();
flags.c->key = 'c';
Modified: grass/branches/develbranch_6/raster/r.out.ascii/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.out.ascii/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.out.ascii/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -89,8 +89,7 @@
parm.width->type = TYPE_INTEGER;
parm.width->required = NO;
parm.width->description =
- _
- ("Number of values printed before wrapping a line (only SURFER or MODFLOW format)");
+ _("Number of values printed before wrapping a line (only SURFER or MODFLOW format)");
parm.null = G_define_option();
parm.null->key = "null";
Modified: grass/branches/develbranch_6/raster/r.out.mpeg/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.out.mpeg/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.out.mpeg/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -422,8 +422,7 @@
conv = G_define_flag();
conv->key = 'c';
conv->description =
- _
- ("Convert on the fly, use less disk space\n\t(requires r.out.ppm with stdout option)");
+ _("Convert on the fly, use less disk space\n\t(requires r.out.ppm with stdout option)");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/raster/r.out.vrml/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.out.vrml/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.out.vrml/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -46,8 +46,7 @@
module = G_define_module();
module->keywords = _("raster, export, VRML");
module->description =
- _
- ("Export a raster map to the Virtual Reality Modeling Language (VRML)");
+ _("Export a raster map to the Virtual Reality Modeling Language (VRML)");
rast_el = G_define_option();
rast_el->key = "elev";
Modified: grass/branches/develbranch_6/raster/r.out.vtk/parameters.c
===================================================================
--- grass/branches/develbranch_6/raster/r.out.vtk/parameters.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.out.vtk/parameters.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -63,8 +63,7 @@
param.point = G_define_flag();
param.point->key = 'p';
param.point->description =
- _
- ("Create VTK point data instead of VTK cell data (if no elevation map is given)");
+ _("Create VTK point data instead of VTK cell data (if no elevation map is given)");
param.rgbmaps = G_define_option();
param.rgbmaps->key = "rgbmaps";
@@ -74,8 +73,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";
@@ -85,8 +83,7 @@
param.vectmaps->multiple = YES;
param.vectmaps->guisection = "Advanced options";
param.vectmaps->description =
- _
- ("Three (x,y,z) raster maps to create vector values [xmap,ymap,zmap]");
+ _("Three (x,y,z) raster maps to create vector values [xmap,ymap,zmap]");
param.elevscale = G_define_option();
param.elevscale->key = "elevscale";
@@ -123,8 +120,7 @@
param.usevertices->key = 'v';
param.usevertices->guisection = "Advanced options";
param.usevertices->description =
- _
- ("Use polydata-vertices for elevation grid creation (to use with vtkDelauny2D)");
+ _("Use polydata-vertices for elevation grid creation (to use with vtkDelauny2D)");
param.origin = G_define_flag();
param.origin->key = 'o';
Modified: grass/branches/develbranch_6/raster/r.profile/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.profile/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.profile/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -52,8 +52,7 @@
module = G_define_module();
module->keywords = _("raster");
module->description =
- _
- ("Outputs the raster map layer values lying on user-defined line(s).");
+ _("Outputs the raster map layer values lying on user-defined line(s).");
parm.opt1 = G_define_standard_option(G_OPT_R_INPUT);
@@ -95,8 +94,7 @@
parm.g = G_define_flag();
parm.g->key = 'g';
parm.g->description =
- _
- ("Output easting and northing in first two columns of four column output");
+ _("Output easting and northing in first two columns of four column output");
parm.c = G_define_flag();
parm.c->key = 'c';
Modified: grass/branches/develbranch_6/raster/r.proj/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.proj/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.proj/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -128,8 +128,7 @@
module = G_define_module();
module->keywords = _("raster, projection");
module->description =
- _
- ("Re-projects a raster map from one location to the current location.");
+ _("Re-projects a raster map from one location to the current location.");
inmap = G_define_standard_option(G_OPT_R_INPUT);
inmap->description = _("Name of input raster map to re-project");
Modified: grass/branches/develbranch_6/raster/r.proj.seg/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.proj.seg/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.proj.seg/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -134,8 +134,7 @@
module = G_define_module();
module->keywords = _("raster, projection");
module->description =
- _
- ("Re-projects a raster map from one location to the current location.");
+ _("Re-projects a raster map from one location to the current location.");
inmap = G_define_standard_option(G_OPT_R_INPUT);
inmap->description = _("Name of input raster map to re-project");
Modified: grass/branches/develbranch_6/raster/r.reclass/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.reclass/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.reclass/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -102,8 +102,7 @@
if (tty) {
fprintf(stdout,
- _
- ("Enter rule(s), \"end\" when done, \"help\" if you need it\n"));
+ _("Enter rule(s), \"end\" when done, \"help\" if you need it\n"));
if (fp)
fprintf(stdout, _("fp: Data range is %.25f to %.25f\n"),
(double)min, (double)max);
Modified: grass/branches/develbranch_6/raster/r.report/parse.c
===================================================================
--- grass/branches/develbranch_6/raster/r.report/parse.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.report/parse.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -42,8 +42,7 @@
parms.units->required = NO;
parms.units->multiple = YES;
parms.units->description =
- _
- ("mi(les),me(ters),k(ilometers),a(cres),h(ectares),c(ell_counts),p(ercent_cover)");
+ _("mi(les),me(ters),k(ilometers),a(cres),h(ectares),c(ell_counts),p(ercent_cover)");
parms.units->options = "mi,me,k,a,h,c,p";
parms.nv = G_define_option();
Modified: grass/branches/develbranch_6/raster/r.rescale/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.rescale/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.rescale/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -66,8 +66,7 @@
parm.from->type = TYPE_INTEGER;
parm.from->required = NO;
parm.from->description =
- _
- ("The input data range to be rescaled (default: full range of input map)");
+ _("The input data range to be rescaled (default: full range of input map)");
parm.output = G_define_option();
parm.output->key = "output";
Modified: grass/branches/develbranch_6/raster/r.rescale.eq/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.rescale.eq/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.rescale.eq/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -69,8 +69,7 @@
parm.from->type = TYPE_INTEGER;
parm.from->required = NO;
parm.from->description =
- _
- ("The input data range to be rescaled (default: full range of input map)");
+ _("The input data range to be rescaled (default: full range of input map)");
parm.output = G_define_option();
parm.output->key = "output";
Modified: grass/branches/develbranch_6/raster/r.slope.aspect/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.slope.aspect/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.slope.aspect/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -220,8 +220,7 @@
parm.dx->answer = NULL;
parm.dx->gisprompt = "new,cell,raster";
parm.dx->description =
- _
- ("Name for output first order partial derivative dx (E-W slope) raster map");
+ _("Name for output first order partial derivative dx (E-W slope) raster map");
parm.dx->guisection = _("Advanced");
parm.dy = G_define_option();
@@ -231,8 +230,7 @@
parm.dy->answer = NULL;
parm.dy->gisprompt = "new,cell,raster";
parm.dy->description =
- _
- ("Name for output first order partial derivative dy (N-S slope) raster map");
+ _("Name for output first order partial derivative dy (N-S slope) raster map");
parm.dy->guisection = _("Advanced");
parm.dxx = G_define_option();
Modified: grass/branches/develbranch_6/raster/r.sun/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.sun/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.sun/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -175,8 +175,7 @@
module->keywords = _("raster");
module->label = _("Solar irradiance and irradiation model.");
module->description =
- _
- ("Computes direct (beam), diffuse and reflected solar irradiation raster "
+ _("Computes direct (beam), diffuse and reflected solar irradiation raster "
"maps for given day, latitude, surface and atmospheric conditions. Solar "
"parameters (e.g. sunrise, sunset times, declination, extraterrestrial "
"irradiance, daylight length) are saved in the map history file. "
@@ -215,8 +214,7 @@
parm.aspin->required = YES;
parm.aspin->gisprompt = "old,cell,raster";
parm.aspin->description =
- _
- ("Name of the input aspect map (terrain aspect or azimuth of the solar panel) [decimal degrees]");
+ _("Name of the input aspect map (terrain aspect or azimuth of the solar panel) [decimal degrees]");
parm.aspin->guisection = _("Input_options");
@@ -226,8 +224,7 @@
parm.slopein->required = YES;
parm.slopein->gisprompt = "old,cell,raster";
parm.slopein->description =
- _
- ("Name of the input slope raster map (terrain slope or solar panel inclination) [decimal degrees]");
+ _("Name of the input slope raster map (terrain slope or solar panel inclination) [decimal degrees]");
parm.slopein->guisection = _("Input_options");
parm.linkein = G_define_option();
@@ -236,8 +233,7 @@
parm.linkein->required = NO;
parm.linkein->gisprompt = "old,cell,raster";
parm.linkein->description =
- _
- ("Name of the Linke atmospheric turbidity coefficient input raster map [-]");
+ _("Name of the Linke atmospheric turbidity coefficient input raster map [-]");
parm.linkein->guisection = _("Input_options");
if (parm.linkein->answer == NULL) {
@@ -248,8 +244,7 @@
parm.lin->required = NO;
parm.lin->guisection = _("Input_options");
parm.lin->description =
- _
- ("A single value of the Linke atmospheric turbidity coefficient [-]");
+ _("A single value of the Linke atmospheric turbidity coefficient [-]");
}
parm.albedo = G_define_option();
@@ -324,8 +319,7 @@
parm.beam_rad->required = NO;
parm.beam_rad->gisprompt = "new,cell,raster";
parm.beam_rad->description =
- _
- ("Output beam irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
+ _("Output beam irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
parm.beam_rad->guisection = _("Output_options");
parm.insol_time = G_define_option();
@@ -343,8 +337,7 @@
parm.diff_rad->required = NO;
parm.diff_rad->gisprompt = "new,cell,raster";
parm.diff_rad->description =
- _
- ("Output diffuse irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
+ _("Output diffuse irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
parm.diff_rad->guisection = _("Output_options");
parm.refl_rad = G_define_option();
@@ -353,8 +346,7 @@
parm.refl_rad->required = NO;
parm.refl_rad->gisprompt = "new,cell,raster";
parm.refl_rad->description =
- _
- ("Output ground reflected irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
+ _("Output ground reflected irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
parm.refl_rad->guisection = _("Output_options");
parm.day = G_define_option();
@@ -376,8 +368,7 @@
parm.declin->type = TYPE_DOUBLE;
parm.declin->required = NO;
parm.declin->description =
- _
- ("Declination value (overriding the internally computed value) [radians]");
+ _("Declination value (overriding the internally computed value) [radians]");
parm.ltime = G_define_option();
parm.ltime->key = "time";
Modified: grass/branches/develbranch_6/raster/r.sunmask/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.sunmask/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.sunmask/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -209,8 +209,7 @@
parm.timezone->type = TYPE_INTEGER;
parm.timezone->required = NO;
parm.timezone->description =
- _
- ("B: timezone (east positive, offset from GMT, also use to adjust daylight savings)");
+ _("B: timezone (east positive, offset from GMT, also use to adjust daylight savings)");
parm.timezone->guisection = _("By_time");
parm.east = G_define_option();
Modified: grass/branches/develbranch_6/raster/r.to.rast3/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.rast3/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.to.rast3/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -278,8 +278,7 @@
if (maptype_tmp != globalRastMapType) {
fatal_error(map, fd, opencells,
- _
- ("Input maps have to be from the same type. CELL, FCELL or DCELL!"));
+ _("Input maps have to be from the same type. CELL, FCELL or DCELL!"));
}
}
Modified: grass/branches/develbranch_6/raster/r.to.rast3elev/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.rast3elev/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.to.rast3elev/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -399,8 +399,7 @@
module = G_define_module();
module->keywords = _("raster, raster3d, voxel, conversion");
module->description =
- _
- ("Creates a 3D volume map based on 2D elevation and value raster maps.");
+ _("Creates a 3D volume map based on 2D elevation and value raster maps.");
/* Get parameters from user */
set_params();
Modified: grass/branches/develbranch_6/raster/r.to.vect/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.vect/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.to.vect/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -70,8 +70,7 @@
value_flg = G_define_flag();
value_flg->key = 'v';
value_flg->description =
- _
- ("Use raster values as categories instead of unique sequence (CELL only)");
+ _("Use raster values as categories instead of unique sequence (CELL only)");
z_flg = G_define_flag();
z_flg->key = 'z';
@@ -82,8 +81,7 @@
no_topol = G_define_flag();
no_topol->key = 'b';
no_topol->description =
- _
- ("Do not build vector topology (use with care for massive point export)");
+ _("Do not build vector topology (use with care for massive point export)");
/* please, remove before GRASS 7 released */
quiet = G_define_flag();
Modified: grass/branches/develbranch_6/raster/r.topidx/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.topidx/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.topidx/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -36,8 +36,7 @@
module = G_define_module();
module->keywords = _("raster");
module->description =
- _
- ("Creates topographic index [ln(a/tan(beta))] map from elevation map.");
+ _("Creates topographic index [ln(a/tan(beta))] map from elevation map.");
params.input = G_define_standard_option(G_OPT_R_INPUT);
params.input->description = _("Input elevation map");
Modified: grass/branches/develbranch_6/raster/r.transect/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.transect/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.transect/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -94,8 +94,7 @@
coord = G_define_flag();
coord->key = 'g';
coord->description =
- _
- ("Output easting and northing in first two columns of four column output");
+ _("Output easting and northing in first two columns of four column output");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/raster/r.univar2/r.univar_main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.univar2/r.univar_main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.univar2/r.univar_main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -74,8 +74,7 @@
module = G_define_module();
module->keywords = _("raster, statistics");
module->description =
- _
- ("Calculates univariate statistics from the non-null cells of a raster map.");
+ _("Calculates univariate statistics from the non-null cells of a raster map.");
/* Define the different options */
set_params();
Modified: grass/branches/develbranch_6/raster/r.univar2/r3.univar_main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.univar2/r3.univar_main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.univar2/r3.univar_main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -78,8 +78,7 @@
module = G_define_module();
module->keywords = _("raster3d, statistics");
module->description =
- _
- ("Calculates univariate statistics from the non-null 3d cells of a raster3d map.");
+ _("Calculates univariate statistics from the non-null 3d cells of a raster3d map.");
/* Define the different options */
set_params();
Modified: grass/branches/develbranch_6/raster/r.volume/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.volume/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.volume/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -66,8 +66,7 @@
opt1->required = YES;
opt1->gisprompt = "old,cell,raster";
opt1->description =
- _
- ("Existing raster map representing data that will be summed within clumps");
+ _("Existing raster map representing data that will be summed within clumps");
opt2 = G_define_option();
opt2->key = "clump";
Modified: grass/branches/develbranch_6/raster/r.walk/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.walk/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.walk/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -282,8 +282,7 @@
opt11->multiple = NO;
opt11->answer = "1.0";
opt11->description =
- _
- ("Lambda coefficients for combining walking energy and friction cost");
+ _("Lambda coefficients for combining walking energy and friction cost");
opt13 = G_define_option();
opt13->key = "slope_factor";
Modified: grass/branches/develbranch_6/raster/r.what/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.what/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/r.what/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -91,8 +91,7 @@
module = G_define_module();
module->keywords = _("raster");
module->description =
- _
- ("Queries raster map layers on their category values and category labels.");
+ _("Queries raster map layers on their category values and category labels.");
opt1 = G_define_option();
opt1->key = "input";
Modified: grass/branches/develbranch_6/raster/simwe/r.sim.water/main.c
===================================================================
--- grass/branches/develbranch_6/raster/simwe/r.sim.water/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/simwe/r.sim.water/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -183,8 +183,7 @@
parm.rain->key = "rain";
parm.rain->required = NO;
parm.rain->description =
- _
- ("Name of the rainfall excess rate (rain-infilt) raster map [mm/hr]");
+ _("Name of the rainfall excess rate (rain-infilt) raster map [mm/hr]");
parm.rain->guisection = _("Input_options");
parm.rainval = G_define_option();
@@ -314,8 +313,7 @@
parm.hmax->answer = HMAX;
parm.hmax->required = NO;
parm.hmax->description =
- _
- ("Threshold water depth [m] (diffusion increases after this water depth is reached)");
+ _("Threshold water depth [m] (diffusion increases after this water depth is reached)");
parm.hmax->guisection = _("Parameters");
parm.halpha = G_define_option();
Modified: grass/branches/develbranch_6/raster/wildfire/r.ros/main.c
===================================================================
--- grass/branches/develbranch_6/raster/wildfire/r.ros/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/wildfire/r.ros/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -278,8 +278,7 @@
parm.aspect->type = TYPE_STRING;
parm.aspect->gisprompt = "old,cell,raster";
parm.aspect->description =
- _
- ("Name of raster map containing ASPECT (degree, anti-clockwise from E)");
+ _("Name of raster map containing ASPECT (degree, anti-clockwise from E)");
parm.elev = G_define_option();
parm.elev->key = "elevation";
Modified: grass/branches/develbranch_6/raster/wildfire/r.spread/main.c
===================================================================
--- grass/branches/develbranch_6/raster/wildfire/r.spread/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster/wildfire/r.spread/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -102,8 +102,7 @@
module = G_define_module();
module->keywords = _("raster");
module->label =
- _
- ("Simulates elliptically anisotropic spread on a graphics window and "
+ _("Simulates elliptically anisotropic spread on a graphics window and "
"generates a raster map of the cumulative time of spread, "
"given raster maps containing the rates of spread (ROS), the ROS "
"directions and the spread origins.");
@@ -153,8 +152,7 @@
parm.spotdist->gisprompt = "old,cell,raster";
parm.spotdist->guisection = _("Input_maps");
parm.spotdist->description =
- _
- ("Name of raster map containing max SPOTting DISTance (m) (required w/ -s)");
+ _("Name of raster map containing max SPOTting DISTance (m) (required w/ -s)");
parm.velocity = G_define_option();
parm.velocity->key = "w_speed";
@@ -162,8 +160,7 @@
parm.velocity->gisprompt = "old,cell,raster";
parm.velocity->guisection = _("Input_maps");
parm.velocity->description =
- _
- ("Name of raster map containing midflame Wind SPEED (ft/min) (required w/ -s)");
+ _("Name of raster map containing midflame Wind SPEED (ft/min) (required w/ -s)");
parm.mois = G_define_option();
parm.mois->key = "f_mois";
@@ -171,8 +168,7 @@
parm.mois->gisprompt = "old,cell,raster";
parm.mois->guisection = _("Input_maps");
parm.mois->description =
- _
- ("Name of raster map containing fine Fuel MOISture of the cell receiving a spotting firebrand (%) (required w/ -s)");
+ _("Name of raster map containing fine Fuel MOISture of the cell receiving a spotting firebrand (%) (required w/ -s)");
parm.least = G_define_option();
parm.least->key = "least_size";
@@ -187,8 +183,7 @@
parm.comp_dens->type = TYPE_STRING;
parm.comp_dens->key_desc = "decimal";
parm.comp_dens->description =
- _
- ("Sampling DENSity for additional COMPutin (range: 0.0 - 1.0 (0.5))");
+ _("Sampling DENSity for additional COMPutin (range: 0.0 - 1.0 (0.5))");
parm.init_time = G_define_option();
parm.init_time->key = "init_time";
@@ -415,8 +410,7 @@
}
if (G_find_cell2(out_layer, G_mapset())) {
sprintf(buf,
- _
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ _("Raster map <%s> already exists in mapset <%s>, select another name"),
out_layer, G_mapset());
G_fatal_error(buf);
exit(EXIT_FAILURE);
@@ -430,8 +424,7 @@
}
if (G_find_cell2(x_out_layer, G_mapset())) {
sprintf(buf,
- _
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ _("Raster map <%s> already exists in mapset <%s>, select another name"),
x_out_layer, G_mapset());
G_fatal_error(buf);
exit(EXIT_FAILURE);
@@ -446,8 +439,7 @@
}
if (G_find_cell2(y_out_layer, G_mapset())) {
sprintf(buf,
- _
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ _("Raster map <%s> already exists in mapset <%s>, select another name"),
y_out_layer, G_mapset());
G_fatal_error(buf);
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/raster3d/base/r3.info.main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/base/r3.info.main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster3d/base/r3.info.main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -77,8 +77,7 @@
module = G_define_module();
module->keywords = _("raster3d, voxel");
module->description =
- _
- ("Outputs basic information about a user-specified 3D raster map layer.");
+ _("Outputs basic information about a user-specified 3D raster map layer.");
opt1 = G_define_option();
opt1->key = "map";
@@ -111,8 +110,7 @@
timestampflag = G_define_flag();
timestampflag->key = 'p';
timestampflag->description =
- _
- ("Print 3D raster map timestamp (day.month.year hour:minute:seconds) only");
+ _("Print 3D raster map timestamp (day.month.year hour:minute:seconds) only");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.cross.rast/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster3d/r3.cross.rast/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -269,8 +269,7 @@
module = G_define_module();
module->keywords = _("raster3d, voxel");
module->description =
- _
- ("Creates cross section 2D raster map from 3d raster map based on 2D elevation map");
+ _("Creates cross section 2D raster map from 3d raster map based on 2D elevation map");
/* Get parameters from user */
set_params();
Modified: grass/branches/develbranch_6/raster3d/r3.gwflow/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.gwflow/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster3d/r3.gwflow/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -60,8 +60,7 @@
param.status->required = YES;
param.status->gisprompt = "old,grid3,3d-raster";
param.status->description =
- _
- ("The status for each cell, = 0 - inactive, 1 - active, 2 - dirichlet");
+ _("The status for each cell, = 0 - inactive, 1 - active, 2 - dirichlet");
param.hc_x = G_define_option();
param.hc_x->key = "hc_x";
@@ -114,8 +113,7 @@
param.output->required = YES;
param.output->gisprompt = "new,grid3,3d-raster";
param.output->description =
- _
- ("The piezometric head result of the numerical calculation will be written to this map");
+ _("The piezometric head result of the numerical calculation will be written to this map");
param.vector = G_define_option();
param.vector->key = "velocity";
@@ -123,8 +121,7 @@
param.vector->required = NO;
param.vector->gisprompt = "new,grid3,3d-raster";
param.vector->description =
- _
- ("Calculate the groundwater distance velocity vector field and write the x, y, and z components to maps named name_[xyz]. Name is basename for the new raster3d maps");
+ _("Calculate the groundwater distance velocity vector field and write the x, y, and z components to maps named name_[xyz]. Name is basename for the new raster3d maps");
param.dt = N_define_standard_option(N_OPT_CALC_TIME);
@@ -140,8 +137,7 @@
param.sparse = G_define_flag();
param.sparse->key = 's';
param.sparse->description =
- _
- ("Use a sparse linear equation system, only available with iterative solvers");
+ _("Use a sparse linear equation system, only available with iterative solvers");
}
/* ************************************************************************* */
@@ -171,8 +167,7 @@
module = G_define_module();
module->keywords = _("raster3d, voxel");
module->description =
- _
- ("Numerical calculation program for transient, confined groundwater flow in three dimensions");
+ _("Numerical calculation program for transient, confined groundwater flow in three dimensions");
/* Get parameters from user */
set_params();
Modified: grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -87,8 +87,7 @@
param.nv->multiple = NO;
param.nv->answer = "none";
param.nv->description =
- _
- ("String representing NULL value data cell (use 'none' if no such value)");
+ _("String representing NULL value data cell (use 'none' if no such value)");
}
/*---------------------------------------------------------------------------*/
@@ -240,8 +239,7 @@
module = G_define_module();
module->keywords = _("raster3d, voxel, import");
module->description =
- _
- ("Convert a 3D ASCII raster text file into a (binary) 3D raster map layer");
+ _("Convert a 3D ASCII raster text file into a (binary) 3D raster map layer");
setParams();
G3d_setStandard3dInputParams();
Modified: grass/branches/develbranch_6/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.mkdspf/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster3d/r3.mkdspf/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -74,8 +74,7 @@
module = G_define_module();
module->keywords = _("raster3d, voxel");
module->description =
- _
- ("Creates a display file from an existing grid3 file according to specified threshold levels.");
+ _("Creates a display file from an existing grid3 file according to specified threshold levels.");
name = G_define_option();
name->key = "input";
Modified: grass/branches/develbranch_6/raster3d/r3.out.vtk/parameters.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.vtk/parameters.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster3d/r3.out.vtk/parameters.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -44,8 +44,7 @@
param.point = G_define_flag();
param.point->key = 'p';
param.point->description =
- _
- ("Create VTK pointdata instead of VTK celldata (celldata is default)");
+ _("Create VTK pointdata instead of VTK celldata (celldata is default)");
param.top = G_define_option();
param.top->key = "top";
@@ -69,8 +68,7 @@
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();
@@ -81,8 +79,7 @@
param.rgbmaps->multiple = YES;
param.rgbmaps->guisection = "Advanced options";
param.rgbmaps->description =
- _
- ("Three (r,g,b) 3d raster maps to create rgb values [redmap,greenmap,bluemap]");
+ _("Three (r,g,b) 3d raster maps to create rgb values [redmap,greenmap,bluemap]");
param.vectormaps = G_define_option();
param.vectormaps->key = "vectormaps";
@@ -92,8 +89,7 @@
param.vectormaps->multiple = YES;
param.vectormaps->guisection = "Advanced options";
param.vectormaps->description =
- _
- ("Three (x,y,z) 3d raster maps to create vector values [xmap,ymap,zmap]");
+ _("Three (x,y,z) 3d raster maps to create vector values [xmap,ymap,zmap]");
param.elevscale = G_define_option();
Modified: grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKData.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKData.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -331,8 +331,7 @@
}
G_debug(3,
- _
- ("write_vtk_data: Writing Celldata %s with rows %i cols %i depths %i to vtk-ascii file"),
+ _("write_vtk_data: Writing Celldata %s with rows %i cols %i depths %i to vtk-ascii file"),
varname, rows, cols, depths);
fprintf(fp, "SCALARS %s float 1\n", varname);
Modified: grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKHead.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKHead.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKHead.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -36,8 +36,7 @@
double scale)
{
G_debug(3,
- _
- ("write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"));
+ _("write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"));
/*Simple vtk ASCII header */
@@ -93,8 +92,7 @@
G3D_Region region)
{
G_debug(3,
- _
- ("write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header"));
+ _("write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header"));
fprintf(fp, "# vtk DataFile Version 3.0\n");
fprintf(fp, "GRASS 6 Export\n");
fprintf(fp, "ASCII\n");
@@ -115,8 +113,7 @@
G3D_Region region)
{
G_debug(3,
- _
- ("write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"));
+ _("write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"));
fprintf(fp, "# vtk DataFile Version 3.0\n");
fprintf(fp, "GRASS 6 Export\n");
fprintf(fp, "ASCII\n");
Modified: grass/branches/develbranch_6/vector/lidar/v.lidar.correction/main.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.lidar.correction/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/lidar/v.lidar.correction/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -63,8 +63,7 @@
module = G_define_module();
module->keywords = _("vector, LIDAR");
module->description =
- _
- ("Correction of the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering.");
+ _("Correction of the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering.");
in_opt = G_define_standard_option(G_OPT_V_INPUT);
in_opt->description =
Modified: grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/main.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -339,8 +339,7 @@
if (flag_auxiliar == FALSE) {
G_debug(1,
- _
- ("Creating auxiliar table for archiving overlaping zones"));
+ _("Creating auxiliar table for archiving overlaping zones"));
if ((flag_auxiliar =
Create_AuxEdge_Table(driver)) == FALSE)
G_fatal_error(_("It was impossible to create <%s>."),
Modified: grass/branches/develbranch_6/vector/lidar/v.surf.bspline/crosscorr.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.surf.bspline/crosscorr.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/lidar/v.surf.bspline/crosscorr.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -304,12 +304,10 @@
/* Writing some output */
fprintf(stdout,
- _
- ("CrossCorrelation: Different number of splines and lambda_i values have "
+ _("CrossCorrelation: Different number of splines and lambda_i values have "
"been taken for the cross correlation\n"));
fprintf(stdout,
- _
- ("CrossCorrelation: The minimum value for the test (rms=%lf) was obtained with:\n"),
+ _("CrossCorrelation: The minimum value for the test (rms=%lf) was obtained with:\n"),
rms_min);
fprintf(stdout, _("CrossCorrelation: lambda_i = %.3f\n"),
lambda[lbd_min]);
Modified: grass/branches/develbranch_6/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.surf.bspline/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/lidar/v.surf.bspline/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -76,8 +76,7 @@
module = G_define_module(); {
module->keywords = _("vector, interpolation");
module->description =
- _
- ("Bicubic or bilinear spline interpolation with Tykhonov regularization.");
+ _("Bicubic or bilinear spline interpolation with Tykhonov regularization.");
}
cross_corr_flag = G_define_flag(); {
@@ -143,8 +142,7 @@
dfield_opt = G_define_standard_option(G_OPT_V_FIELD); {
dfield_opt->description =
- _
- ("Field value. If set to 0, z coordinates are used. (3D vector only)");
+ _("Field value. If set to 0, z coordinates are used. (3D vector only)");
dfield_opt->answer = "0";
dfield_opt->guisection = _("Settings");
}
@@ -154,8 +152,7 @@
col_opt->type = TYPE_STRING;
col_opt->required = NO;
col_opt->description =
- _
- ("Attribute table column with values to interpolate (if layer>0)");
+ _("Attribute table column with values to interpolate (if layer>0)");
col_opt->guisection = _("Settings");
}
Modified: grass/branches/develbranch_6/vector/v.buffer/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.buffer/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.buffer/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -253,8 +253,7 @@
module = G_define_module();
module->keywords = _("vector");
module->description =
- _
- ("Creates a buffer around features of given type (areas must contain centroid).");
+ _("Creates a buffer around features of given type (areas must contain centroid).");
in_opt = G_define_standard_option(G_OPT_V_INPUT);
out_opt = G_define_standard_option(G_OPT_V_OUTPUT);
Modified: grass/branches/develbranch_6/vector/v.build/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.build/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.build/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -39,8 +39,7 @@
err_opt = G_define_standard_option(G_OPT_V_OUTPUT);
err_opt->key = "error";
err_opt->description =
- _
- ("Name for vector map where erroneous vector features are written to");
+ _("Name for vector map where erroneous vector features are written to");
err_opt->required = NO;
opt = G_define_option();
Modified: grass/branches/develbranch_6/vector/v.db.connect/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.db.connect/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.db.connect/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -166,8 +166,7 @@
}
else {
fprintf(stdout,
- _
- ("layer <%d> table <%s> in database <%s> through driver "
+ _("layer <%d> table <%s> in database <%s> through driver "
"<%s> with key <%s>\n"), fi->number,
fi->table, fi->database, fi->driver, fi->key);
}
Modified: grass/branches/develbranch_6/vector/v.digit/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.digit/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.digit/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -114,8 +114,7 @@
bgcmd_opt->multiple = NO;
bgcmd_opt->answer = "";
bgcmd_opt->description =
- _
- ("Display commands to be used for canvas backdrop (separated by ';')");
+ _("Display commands to be used for canvas backdrop (separated by ';')");
new_f = G_define_flag();
new_f->key = 'n';
Modified: grass/branches/develbranch_6/vector/v.distance/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.distance/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.distance/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -114,8 +114,7 @@
module = G_define_module();
module->keywords = _("vector, database, attribute table");
module->description =
- _
- ("Finds the nearest element in vector map 'to' for elements in vector map 'from'.");
+ _("Finds the nearest element in vector map 'to' for elements in vector map 'from'.");
from_opt = G_define_standard_option(G_OPT_V_INPUT);
from_opt->key = "from";
@@ -191,8 +190,7 @@
column_opt->required = YES;
column_opt->multiple = YES;
column_opt->description =
- _
- ("Column name(s) where values specified by 'upload' option will be uploaded");
+ _("Column name(s) where values specified by 'upload' option will be uploaded");
column_opt->guisection = _("From_map");
to_column_opt = G_define_standard_option(G_OPT_COLUMN);
@@ -203,16 +201,14 @@
table_opt = G_define_standard_option(G_OPT_TABLE);
table_opt->description =
- _
- ("Name of table created for output when the distance to all flag is used");
+ _("Name of table created for output when the distance to all flag is used");
print_flag = G_define_flag();
print_flag->key = 'p';
print_flag->label =
_("Print output to stdout, don't update attribute table");
print_flag->description =
- _
- ("First column is always category of 'from' feature called from_cat");
+ _("First column is always category of 'from' feature called from_cat");
all_flag = G_define_flag();
all_flag->key = 'a';
Modified: grass/branches/develbranch_6/vector/v.edit/args.c
===================================================================
--- grass/branches/develbranch_6/vector/v.edit/args.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.edit/args.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -185,8 +185,7 @@
params->snap->type = TYPE_STRING;
params->snap->options = "no,node,vertex";
params->snap->description =
- _
- ("Snap added or modified features in the given threshold to the nearest existing feature");
+ _("Snap added or modified features in the given threshold to the nearest existing feature");
params->snap->descriptions =
_("no;Not apply snapping;" "node;Snap only to node;"
"vertex;Allow snapping also to vertex");
Modified: grass/branches/develbranch_6/vector/v.external/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.external/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.external/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -80,8 +80,7 @@
layer_opt->required = NO;
layer_opt->multiple = NO;
layer_opt->description =
- _
- ("OGR layer name. If not given, available layers are printed only. Examples:\n"
+ _("OGR layer name. If not given, available layers are printed only. Examples:\n"
"\t\tESRI Shapefile: shapefile name\n"
"\t\tMapInfo File: mapinfo file name");
Modified: grass/branches/develbranch_6/vector/v.extract/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.extract/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.extract/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -108,8 +108,7 @@
newopt->required = NO;
newopt->answer = "-1";
newopt->label =
- _
- ("Enter -1 to keep original categories or the desired NEW category value");
+ _("Enter -1 to keep original categories or the desired NEW category value");
newopt->description = _("If new >= 0, table is not copied");
listopt = G_define_standard_option(G_OPT_V_CATS);
@@ -119,8 +118,7 @@
fileopt->key = "file";
fileopt->required = NO;
fileopt->label =
- _
- ("Input text file with category numbers/number ranges to be extracted");
+ _("Input text file with category numbers/number ranges to be extracted");
fileopt->description = _("If '-' given reads from standard input");
whereopt = G_define_standard_option(G_OPT_WHERE);
Modified: grass/branches/develbranch_6/vector/v.generalize/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.generalize/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.generalize/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -76,8 +76,7 @@
/* initialize module */
module = G_define_module();
module->keywords =
- _
- ("vector, generalization, simplification, smoothing, displacement, network generalization");
+ _("vector, generalization, simplification, smoothing, displacement, network generalization");
module->description = _("Vector based generalization.");
/* Define the different options as defined in gis.h */
@@ -135,8 +134,7 @@
reduction_opt->answer = "50";
reduction_opt->options = "0-100";
reduction_opt->description =
- _
- ("Percentage of the points in the output of 'douglas_reduction' algorithm");
+ _("Percentage of the points in the output of 'douglas_reduction' algorithm");
slide_opt = G_define_option();
slide_opt->key = "slide";
Modified: grass/branches/develbranch_6/vector/v.hull/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.hull/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.hull/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -287,8 +287,7 @@
module = G_define_module();
module->keywords = _("vector, geometry");
module->description =
- _
- ("Uses a GRASS vector points map to produce a convex hull vector map.");
+ _("Uses a GRASS vector points map to produce a convex hull vector map.");
input = G_define_standard_option(G_OPT_V_INPUT);
input->description = _("Name of input vector points map");
Modified: grass/branches/develbranch_6/vector/v.in.ascii/in.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ascii/in.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.in.ascii/in.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -47,15 +47,13 @@
module = G_define_module();
module->keywords = _("vector, import");
module->description =
- _
- ("Creates a vector map from ASCII points file or ASCII vector file.");
+ _("Creates a vector map from ASCII points file or ASCII vector file.");
/************************** Command Parser ************************************/
old = G_define_standard_option(G_OPT_F_INPUT);
old->required = NO;
old->description =
- _
- ("ASCII file to be imported, if not given reads from standard input");
+ _("ASCII file to be imported, if not given reads from standard input");
old->guisection = _("Required");
new = G_define_standard_option(G_OPT_V_OUTPUT);
@@ -80,8 +78,7 @@
skip_opt->multiple = NO;
skip_opt->answer = "0";
skip_opt->description =
- _
- ("Number of header lines to skip at top of input file (points mode)");
+ _("Number of header lines to skip at top of input file (points mode)");
columns_opt = G_define_standard_option(G_OPT_COLUMNS);
columns_opt->multiple = NO;
@@ -99,8 +96,7 @@
xcol_opt->answer = "1";
xcol_opt->guisection = _("Columns");
xcol_opt->description =
- _
- ("Number of column used as x coordinate (first column is 1) for points mode");
+ _("Number of column used as x coordinate (first column is 1) for points mode");
ycol_opt = G_define_option();
ycol_opt->key = "y";
@@ -110,8 +106,7 @@
ycol_opt->answer = "2";
ycol_opt->guisection = _("Columns");
ycol_opt->description =
- _
- ("Number of column used as y coordinate (first column is 1) for points mode");
+ _("Number of column used as y coordinate (first column is 1) for points mode");
zcol_opt = G_define_option();
zcol_opt->key = "z";
@@ -133,11 +128,9 @@
catcol_opt->answer = "0";
catcol_opt->guisection = _("Columns");
catcol_opt->label =
- _
- ("Number of column used as category (first column is 1) for points mode");
+ _("Number of column used as category (first column is 1) for points mode");
catcol_opt->description =
- _
- ("If 0, unique category is assigned to each row and written to new column 'cat'");
+ _("If 0, unique category is assigned to each row and written to new column 'cat'");
zcoorf = G_define_flag();
zcoorf->key = 'z';
@@ -146,8 +139,7 @@
e_flag = G_define_flag();
e_flag->key = 'e';
e_flag->description =
- _
- ("Create a new empty vector map and exit. Nothing is read from input");
+ _("Create a new empty vector map and exit. Nothing is read from input");
noheader_flag = G_define_flag();
noheader_flag->key = 'n';
Modified: grass/branches/develbranch_6/vector/v.in.db/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.db/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.in.db/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -51,8 +51,7 @@
module = G_define_module();
module->keywords = _("vector, import");
module->description =
- _
- ("Creates new vector (points) map from database table containing coordinates.");
+ _("Creates new vector (points) map from database table containing coordinates.");
table_opt = G_define_standard_option(G_OPT_TABLE);
table_opt->required = YES;
Modified: grass/branches/develbranch_6/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ogr/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.in.ogr/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -573,12 +573,10 @@
}
}
sprintf(error_msg + strlen(error_msg),
- _
- ("\nYou can use the -o flag to %s to override this projection check.\n"),
+ _("\nYou can use the -o flag to %s to override this projection check.\n"),
G_program_name());
strcat(error_msg,
- _
- ("Consider generating a new location with 'location' parameter"
+ _("Consider generating a new location with 'location' parameter"
" from input data set.\n"));
G_fatal_error(error_msg);
}
Modified: grass/branches/develbranch_6/vector/v.info/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.info/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.info/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -63,8 +63,7 @@
module = G_define_module();
module->keywords = _("vector");
module->description =
- _
- ("Outputs basic information about a user-specified vector map layer.");
+ _("Outputs basic information about a user-specified vector map layer.");
/* get G_OPT_ from include/gis.h */
in_opt = G_define_standard_option(G_OPT_V_MAP);
@@ -78,8 +77,7 @@
columns = G_define_flag();
columns->key = 'c';
columns->description =
- _
- ("Print types/names of table columns for specified layer instead of info");
+ _("Print types/names of table columns for specified layer instead of info");
gflag = G_define_flag();
gflag->key = 'g';
@@ -254,26 +252,22 @@
if (Vect_level(&Map) > 1) {
printline("");
sprintf(line,
- _
- (" Number of points: %-9ld Number of areas: %-9ld"),
+ _(" Number of points: %-9ld Number of areas: %-9ld"),
(long)Vect_get_num_primitives(&Map, GV_POINT),
(long)Vect_get_num_areas(&Map));
printline(line);
sprintf(line,
- _
- (" Number of lines: %-9ld Number of islands: %-9ld"),
+ _(" Number of lines: %-9ld Number of islands: %-9ld"),
(long)Vect_get_num_primitives(&Map, GV_LINE),
(long)Vect_get_num_islands(&Map));
printline(line);
sprintf(line,
- _
- (" Number of boundaries: %-9ld Number of faces: %-9ld"),
+ _(" Number of boundaries: %-9ld Number of faces: %-9ld"),
(long)Vect_get_num_primitives(&Map, GV_BOUNDARY),
(long)Vect_get_num_primitives(&Map, GV_FACE));
printline(line);
sprintf(line,
- _
- (" Number of centroids: %-9ld Number of kernels: %-9ld"),
+ _(" Number of centroids: %-9ld Number of kernels: %-9ld"),
(long)Vect_get_num_primitives(&Map, GV_CENTROID),
(long)Vect_get_num_primitives(&Map, GV_KERNEL));
printline(line);
Modified: grass/branches/develbranch_6/vector/v.kernel/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.kernel/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.kernel/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -108,8 +108,7 @@
module = G_define_module();
module->keywords = _("vector, kernel density");
module->description =
- _
- ("Generates a raster density map from vector points data using a moving 2D isotropic Gaussian kernel or "
+ _("Generates a raster density map from vector points data using a moving 2D isotropic Gaussian kernel or "
"optionally generates a vector density map on vector network with a 1D kernel.");
in_opt = G_define_standard_option(G_OPT_V_INPUT);
@@ -164,14 +163,12 @@
flag_o = G_define_flag();
flag_o->key = 'o';
flag_o->description =
- _
- ("Try to calculate an optimal standard deviation with 'stddeviation' taken as maximum (experimental)");
+ _("Try to calculate an optimal standard deviation with 'stddeviation' taken as maximum (experimental)");
flag_q = G_define_flag();
flag_q->key = 'q';
flag_q->description =
- _
- ("Only calculate optimal standard deviation and exit (no map is written)");
+ _("Only calculate optimal standard deviation and exit (no map is written)");
/* please, remove before GRASS 7 released */
flag_v = G_define_flag();
Modified: grass/branches/develbranch_6/vector/v.net/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.net/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -92,8 +92,7 @@
thresh_opt->multiple = NO;
thresh_opt->label = "Threshold";
thresh_opt->description =
- _
- ("Required for operation 'connect'. Connect points in given threshold.");
+ _("Required for operation 'connect'. Connect points in given threshold.");
cats_flag = G_define_flag();
cats_flag->key = 'c';
Modified: grass/branches/develbranch_6/vector/v.net.iso/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.iso/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.net.iso/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -72,8 +72,7 @@
module->label = _("Split net by cost isolines");
module->keywords = _("vector, networking");
module->description =
- _
- ("Splits net to bands between cost isolines (direction from centre). "
+ _("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.");
Modified: grass/branches/develbranch_6/vector/v.net.salesman/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.salesman/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.net.salesman/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -96,8 +96,7 @@
module = G_define_module();
module->keywords = _("vector, networking");
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");
Modified: grass/branches/develbranch_6/vector/v.out.ascii/out.c
===================================================================
--- grass/branches/develbranch_6/vector/v.out.ascii/out.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.out.ascii/out.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -53,8 +53,7 @@
output->multiple = NO;
output->gisprompt = "new_file,file,output";
output->description =
- _
- ("Path to resulting ASCII file or ASCII vector name if '-o' is defined");
+ _("Path to resulting ASCII file or ASCII vector name if '-o' is defined");
format_opt = G_define_option();
format_opt->key = "format";
@@ -88,8 +87,7 @@
region_flag = G_define_flag();
region_flag->key = 'r';
region_flag->description =
- _
- ("Only export points falling within current 3D region (points mode)");
+ _("Only export points falling within current 3D region (points mode)");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/vector/v.patch/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.patch/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.patch/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -77,8 +77,7 @@
bbox->required = NO;
bbox->key = "bbox";
bbox->description =
- _
- ("Name for output vector map where bounding boxes of input vector maps are written to");
+ _("Name for output vector map where bounding boxes of input vector maps are written to");
append = G_define_flag();
append->key = 'a';
Modified: grass/branches/develbranch_6/vector/v.random/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.random/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.random/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -113,8 +113,7 @@
parm.zcol->required = NO;
parm.zcol->multiple = NO;
parm.zcol->label =
- _
- ("Column name and type (i.e. INTEGER, DOUBLE PRECISION) for z values");
+ _("Column name and type (i.e. INTEGER, DOUBLE PRECISION) for z values");
parm.zcol->description =
_("Writes Z data to column instead of 3D vector");
Modified: grass/branches/develbranch_6/vector/v.reclass/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.reclass/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.reclass/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -76,8 +76,7 @@
col_opt = G_define_standard_option(G_OPT_COLUMN);
col_opt->label =
- _
- ("The name of the column whose values are to be used as new categories");
+ _("The name of the column whose values are to be used as new categories");
col_opt->description = _("The column must be type integer or string");
type_opt = G_define_standard_option(G_OPT_V_TYPE);
Modified: grass/branches/develbranch_6/vector/v.support/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.support/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.support/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -115,8 +115,7 @@
cmdhist->type = TYPE_STRING;
cmdhist->required = NO;
cmdhist->description =
- _
- ("Command line to store into vector map history file (used for vector scripts)");
+ _("Command line to store into vector map history file (used for vector scripts)");
r_flag = G_define_flag();
r_flag->key = 'r';
Modified: grass/branches/develbranch_6/vector/v.surf.rst/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.surf.rst/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.surf.rst/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -203,8 +203,7 @@
parm.field = G_define_standard_option(G_OPT_V_FIELD);
parm.field->description =
- _
- ("Field value. If set to 0, z coordinates are used. (3D vector only)");
+ _("Field value. If set to 0, z coordinates are used. (3D vector only)");
parm.field->answer = "1";
parm.zcol = G_define_option();
@@ -212,8 +211,7 @@
parm.zcol->type = TYPE_STRING;
parm.zcol->required = NO;
parm.zcol->description =
- _
- ("Name of the attribute column with values to be used for approximation (if layer>0)");
+ _("Name of the attribute column with values to be used for approximation (if layer>0)");
parm.wheresql = G_define_standard_option(G_OPT_WHERE);
@@ -294,8 +292,7 @@
parm.npmin->answer = MINPOINTS;
parm.npmin->required = NO;
parm.npmin->description =
- _
- ("Minimum number of points for approximation in a segment (>segmax)");
+ _("Minimum number of points for approximation in a segment (>segmax)");
parm.npmin->guisection = _("Settings");
parm.dmin = G_define_option();
@@ -304,8 +301,7 @@
parm.dmin->required = NO;
parm.dmin->answer = dminchar;
parm.dmin->description =
- _
- ("Minimum distance between points (to remove almost identical points)");
+ _("Minimum distance between points (to remove almost identical points)");
parm.dmin->guisection = _("Settings");
parm.dmax = G_define_option();
@@ -314,8 +310,7 @@
parm.dmax->required = NO;
parm.dmax->answer = dmaxchar;
parm.dmax->description =
- _
- ("Maximum distance between points on isoline (to insert additional points)");
+ _("Maximum distance between points on isoline (to insert additional points)");
parm.dmax->guisection = _("Settings");
parm.zmult = G_define_option();
Modified: grass/branches/develbranch_6/vector/v.univar/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.univar/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.univar/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -63,8 +63,7 @@
module = G_define_module();
module->keywords = _("vector, statistics");
module->description =
- _
- ("Calculates univariate statistics for attribute. Variance and standard "
+ _("Calculates univariate statistics for attribute. Variance and standard "
"deviation is calculated only for points if specified.");
map_opt = G_define_standard_option(G_OPT_V_MAP);
Modified: grass/branches/develbranch_6/vector/v.vol.rst/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.vol.rst/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.vol.rst/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -315,8 +315,7 @@
parm.npmin->answer = MINPOINTS;
parm.npmin->required = NO;
parm.npmin->description =
- _
- ("Minimum number of points for approximation in a segment (>segmax)");
+ _("Minimum number of points for approximation in a segment (>segmax)");
parm.npmin->guisection = _("Settings");
parm.dmin1 = G_define_option();
@@ -325,8 +324,7 @@
parm.dmin1->answer = dminchar;
parm.dmin1->required = NO;
parm.dmin1->description =
- _
- ("Minimum distance between points (to remove almost identical points)");
+ _("Minimum distance between points (to remove almost identical points)");
parm.dmin1->guisection = _("Settings");
parm.wmult = G_define_option();
@@ -420,8 +418,7 @@
flag.cv = G_define_flag();
flag.cv->key = 'c';
flag.cv->description =
- _
- ("Perform a cross-validation procedure without volume interpolation");
+ _("Perform a cross-validation procedure without volume interpolation");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/branches/develbranch_6/vector/v.what/what.c
===================================================================
--- grass/branches/develbranch_6/vector/v.what/what.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.what/what.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -133,8 +133,7 @@
fprintf(stdout, "Looking for features within: %f \n",
maxdist);
fprintf(stdout,
- _
- ("Line: %d \nType: %s \nLeft: %d \nRight: %d \n"),
+ _("Line: %d \nType: %s \nLeft: %d \nRight: %d \n"),
line, buf, left, right);
if (type & GV_LINES) {
nnodes = 2;
@@ -154,8 +153,7 @@
Vect_get_node_coor(&(Map[i]), node[n], &nx, &ny, &nz);
fprintf(stdout,
- _
- ("Node[%d]: %d \nNumber of lines: %d \nCoordinates: %.6f, %.6f, %.6f\n"),
+ _("Node[%d]: %d \nNumber of lines: %d \nCoordinates: %.6f, %.6f, %.6f\n"),
n, node[n], nnlines, nx, ny, nz);
for (nli = 0; nli < nnlines; nli++) {
@@ -197,8 +195,7 @@
}
else {
fprintf(stdout,
- _
- ("Line height min: %f \nLine height max: %f\n"),
+ _("Line height min: %f \nLine height max: %f\n"),
min, max);
}
}
@@ -270,8 +267,7 @@
int format = F_TXT, edit_mode = F_VIEW;
fprintf(stdout,
- _
- ("\nDriver: %s\nDatabase: %s\nTable: %s\nKey column: %s\n"),
+ _("\nDriver: %s\nDatabase: %s\nTable: %s\nKey column: %s\n"),
Fi->driver, Fi->database, Fi->table, Fi->key);
F_generate(Fi->driver, Fi->database, Fi->table, Fi->key,
Cats->cat[j], NULL, NULL, edit_mode, format,
Modified: grass/branches/develbranch_6/vector/v.what.rast/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.what.rast/main.c 2008-08-12 00:30:28 UTC (rev 32695)
+++ grass/branches/develbranch_6/vector/v.what.rast/main.c 2008-08-12 00:45:32 UTC (rev 32696)
@@ -79,14 +79,12 @@
module = G_define_module();
module->keywords = _("vector, raster, attribute table");
module->description =
- _
- ("Uploads raster values at positions of vector points to the table.");
+ _("Uploads raster values at positions of vector points to the table.");
vect_opt = G_define_standard_option(G_OPT_V_INPUT);
vect_opt->key = "vector";
vect_opt->description =
- _
- ("Name of input vector points map for which to edit attribute table");
+ _("Name of input vector points map for which to edit attribute table");
rast_opt = G_define_standard_option(G_OPT_R_INPUT);
rast_opt->key = "raster";
More information about the grass-commit
mailing list