[GRASS-SVN] r32586 - in grass/trunk/raster: r.carve r.cats r.clump
r.colors r.contour r.cost r.drain r.flow r.gwflow r.in.ascii
r.in.bin r.in.gdal r.in.mat r.in.xyz r.kappa r.lake
r.li/r.li.daemon r.los r.mfilter r.mfilter.fp r.out.gdal
r.out.pov r.out.vtk r.param.scale r.profile r.proj r.proj.seg
r.random r.random.surface r.reclass r.recode r.resamp.rst
r.slope.aspect r.statistics r.stats r.sun r.sunmask
r.support/front r.support/modhead r.support/modhist
r.surf.fractal r.surf.idw2 r.texture r.thin r.to.rast3
r.to.rast3elev r.to.vect r.topidx r.walk r.water.outlet
r.watershed/seg r.watershed/shed simwe/r.sim.water
simwe/simlib wildfire/r.ros
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 6 18:02:31 EDT 2008
Author: neteler
Date: 2008-08-06 18:02:30 -0400 (Wed, 06 Aug 2008)
New Revision: 32586
Modified:
grass/trunk/raster/r.carve/lobf.c
grass/trunk/raster/r.cats/main.c
grass/trunk/raster/r.clump/clump.c
grass/trunk/raster/r.colors/main.c
grass/trunk/raster/r.colors/rules.c
grass/trunk/raster/r.contour/main.c
grass/trunk/raster/r.cost/main.c
grass/trunk/raster/r.drain/main.c
grass/trunk/raster/r.flow/calc.c
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.gwflow/main.c
grass/trunk/raster/r.in.ascii/gethead.c
grass/trunk/raster/r.in.bin/main.c
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.in.mat/main.c
grass/trunk/raster/r.in.xyz/main.c
grass/trunk/raster/r.kappa/calc_kappa.c
grass/trunk/raster/r.kappa/prt_mat.c
grass/trunk/raster/r.lake/main.c
grass/trunk/raster/r.li/r.li.daemon/daemon.c
grass/trunk/raster/r.li/r.li.daemon/worker.c
grass/trunk/raster/r.los/main.c
grass/trunk/raster/r.mfilter.fp/main.c
grass/trunk/raster/r.mfilter/main.c
grass/trunk/raster/r.out.gdal/main.c
grass/trunk/raster/r.out.pov/main.c
grass/trunk/raster/r.out.vtk/main.c
grass/trunk/raster/r.out.vtk/writeascii.c
grass/trunk/raster/r.param.scale/interface.c
grass/trunk/raster/r.param.scale/process.c
grass/trunk/raster/r.profile/main.c
grass/trunk/raster/r.proj.seg/main.c
grass/trunk/raster/r.proj/main.c
grass/trunk/raster/r.random.surface/main.c
grass/trunk/raster/r.random/main.c
grass/trunk/raster/r.random/random.c
grass/trunk/raster/r.reclass/main.c
grass/trunk/raster/r.reclass/parse.c
grass/trunk/raster/r.recode/main.c
grass/trunk/raster/r.recode/read_rules.c
grass/trunk/raster/r.resamp.rst/main.c
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/raster/r.statistics/main.c
grass/trunk/raster/r.stats/main.c
grass/trunk/raster/r.sun/main.c
grass/trunk/raster/r.sunmask/main.c
grass/trunk/raster/r.support/front/front.c
grass/trunk/raster/r.support/modhead/modhead.c
grass/trunk/raster/r.support/modhist/modhist.c
grass/trunk/raster/r.surf.fractal/interface.c
grass/trunk/raster/r.surf.idw2/main.c
grass/trunk/raster/r.texture/h_measure.c
grass/trunk/raster/r.texture/main.c
grass/trunk/raster/r.thin/io.c
grass/trunk/raster/r.thin/thin_lines.c
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.to.vect/lines.c
grass/trunk/raster/r.to.vect/main.c
grass/trunk/raster/r.topidx/main.c
grass/trunk/raster/r.walk/main.c
grass/trunk/raster/r.water.outlet/main.c
grass/trunk/raster/r.watershed/seg/init_vars.c
grass/trunk/raster/r.watershed/shed/basin_maps.c
grass/trunk/raster/r.watershed/shed/com_line.c
grass/trunk/raster/r.watershed/shed/intro.c
grass/trunk/raster/r.watershed/shed/main.c
grass/trunk/raster/simwe/r.sim.water/main.c
grass/trunk/raster/simwe/simlib/input.c
grass/trunk/raster/wildfire/r.ros/main.c
Log:
fixed unlucky formatted messages (thanks to Glynn)
Modified: grass/trunk/raster/r.carve/lobf.c
===================================================================
--- grass/trunk/raster/r.carve/lobf.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.carve/lobf.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -71,8 +71,7 @@
/* check for divide by zero */
if (0 ==
(denom = DET2_2(pg->sum_x_sq, pg->sum_x, pg->sum_x, pg->npts))) {
- G_warning(_
- ("trying to divide by zero...no unique solution for "
+ G_warning(_("trying to divide by zero...no unique solution for "
"system...skipping..."));
pg->slope = pg->yinter = 0.0;
}
Modified: grass/trunk/raster/r.cats/main.c
===================================================================
--- grass/trunk/raster/r.cats/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.cats/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -153,8 +153,7 @@
G_init_raster_cats("", &cats);
if (0 > G_read_cats(parm.raster->answer, cmapset, &cats))
- G_fatal_error(_
- ("Unable to read category file of raster map <%s@%s>"),
+ G_fatal_error(_("Unable to read category file of raster map <%s@%s>"),
parm.raster->answer, cmapset);
if (G_write_cats(name, &cats) >= 0)
@@ -212,8 +211,7 @@
G_init_raster_cats("", &cats);
if (0 > G_read_cats(name, G_mapset(), &cats))
- G_warning(_
- ("Unable to read category file of raster map <%s@%s>"),
+ G_warning(_("Unable to read category file of raster map <%s@%s>"),
name, G_mapset());
if (parm.fmt_str->answer) {
@@ -252,8 +250,7 @@
}
else {
if (G_read_cats(name, mapset, &cats) < 0)
- G_fatal_error(_
- ("Unable to read category file of raster map <%s> in <%s>"),
+ G_fatal_error(_("Unable to read category file of raster map <%s> in <%s>"),
name, mapset);
}
@@ -269,8 +266,7 @@
}
else {
if (map_type != CELL_TYPE)
- G_warning(_
- ("The map is floating point! Ignoring cats list, using vals list"));
+ G_warning(_("The map is floating point! Ignoring cats list, using vals list"));
else { /* integer map */
for (i = 0; parm.cats->answers[i]; i++)
Modified: grass/trunk/raster/r.clump/clump.c
===================================================================
--- grass/trunk/raster/r.clump/clump.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.clump/clump.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -235,8 +235,7 @@
G_set_null_value(&out_cell[column], 1, CELL_TYPE);
}
if (G_put_raster_row(out_fd, out_cell, CELL_TYPE) < 0)
- G_fatal_error(_
- ("Unable to properly write output raster map"));
+ G_fatal_error(_("Unable to properly write output raster map"));
}
/* switch the buffers so that the current buffer becomes the previous */
Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.colors/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -239,16 +239,13 @@
G_fatal_error(_("No map specified"));
if (!cmap && !style && !rules && !interactive && !remove)
- G_fatal_error(_
- ("One of \"-i\" or \"-r\" or options \"color\", \"rast\" or \"rules\" must be specified!"));
+ G_fatal_error(_("One of \"-i\" or \"-r\" or options \"color\", \"rast\" or \"rules\" must be specified!"));
if (interactive && (style || rules || cmap))
- G_fatal_error(_
- ("Interactive mode is incompatible with \"color\", \"rules\", and \"raster\" options"));
+ G_fatal_error(_("Interactive mode is incompatible with \"color\", \"rules\", and \"raster\" options"));
if ((style && (cmap || rules)) || (cmap && rules))
- G_fatal_error(_
- ("\"color\", \"rules\", and \"raster\" options are mutually exclusive"));
+ G_fatal_error(_("\"color\", \"rules\", and \"raster\" options are mutually exclusive"));
mapset = G_find_cell2(name, "");
@@ -289,22 +286,19 @@
*/
if (strcmp(style, "random") == 0) {
if (fp)
- G_fatal_error(_
- ("Can't make random color table for floating point map"));
+ G_fatal_error(_("Can't make random color table for floating point map"));
G_make_random_colors(&colors, (CELL) min, (CELL) max);
}
else if (strcmp(style, "grey.eq") == 0) {
if (fp)
- G_fatal_error(_
- ("Can't make grey.eq color table for floating point map"));
+ G_fatal_error(_("Can't make grey.eq color table for floating point map"));
if (!have_stats)
have_stats = get_stats(name, mapset, &statf);
G_make_histogram_eq_colors(&colors, &statf);
}
else if (strcmp(style, "grey.log") == 0) {
if (fp)
- G_fatal_error(_
- ("Can't make logarithmic color table for floating point map"));
+ G_fatal_error(_("Can't make logarithmic color table for floating point map"));
if (!have_stats)
have_stats = get_stats(name, mapset, &statf);
G_make_histogram_log_colors(&colors, &statf, (CELL) min,
Modified: grass/trunk/raster/r.colors/rules.c
===================================================================
--- grass/trunk/raster/r.colors/rules.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.colors/rules.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -64,8 +64,7 @@
G_debug(3, "rulemin=%.1f rulemax=%.1f", rulemin, rulemax);
if (rulemin > min || rulemax < max)
- G_warning(_
- ("Your color rules do not cover the whole range of data!\n (rules %f to %f but data %f to %f)"),
+ G_warning(_("Your color rules do not cover the whole range of data!\n (rules %f to %f but data %f to %f)"),
rulemin, rulemax, min, max);
return 1;
Modified: grass/trunk/raster/r.contour/main.c
===================================================================
--- grass/trunk/raster/r.contour/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.contour/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -127,8 +127,7 @@
exit(EXIT_FAILURE);
if (!levels->answers && !step->answer) {
- G_fatal_error(_
- ("Neither \"levels\" nor \"step\" parameter specified."));
+ G_fatal_error(_("Neither \"levels\" nor \"step\" parameter specified."));
}
name = map->answer;
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.cost/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -251,8 +251,7 @@
count++;
if (count != 1)
- G_fatal_error(_
- ("Must specify exactly one of start_points, start_rast or coordinate"));
+ G_fatal_error(_("Must specify exactly one of start_points, start_rast or coordinate"));
}
if (opt3->answers)
@@ -286,8 +285,7 @@
if (!G_is_d_null_value(&null_cost)) {
if (null_cost < 0.0) {
- G_warning(_
- ("Warning: assigning negative cost to null cell. Null cells excluded."));
+ G_warning(_("Warning: assigning negative cost to null cell. Null cells excluded."));
G_set_d_null_value(&null_cost, 1);
}
}
@@ -447,8 +445,7 @@
fbuff = (double *)G_malloc(ncols * sizeof(double));
if (fbuff == NULL)
- G_fatal_error(_
- ("Unable to allocate memory for segment fbuff == NULL"));
+ G_fatal_error(_("Unable to allocate memory for segment fbuff == NULL"));
G_set_d_null_value(fbuff, ncols);
@@ -575,8 +572,7 @@
fd = G_open_cell_old(opt9->answer, search_mapset);
if (fd < 0)
- G_fatal_error(_
- ("can't open raster map [%s] needed for input coordinates"),
+ G_fatal_error(_("can't open raster map [%s] needed for input coordinates"),
opt9->answer);
data_type2 = G_get_raster_map_type(fd);
@@ -636,8 +632,7 @@
value = &zero;
if (top_start_pt->row < 0 || top_start_pt->row >= nrows
|| top_start_pt->col < 0 || top_start_pt->col >= ncols)
- G_fatal_error(_
- ("Specified starting location outside database window"));
+ G_fatal_error(_("Specified starting location outside database window"));
new_cell = insert(zero, top_start_pt->row, top_start_pt->col);
segment_put(&out_seg, value, top_start_pt->row,
top_start_pt->col);
Modified: grass/trunk/raster/r.drain/main.c
===================================================================
--- grass/trunk/raster/r.drain/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.drain/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -189,8 +189,7 @@
if (start_row < 0 || start_row > nrows ||
start_col < 0 || start_col > ncols) {
- G_warning(_
- ("Starting point %d is outside the current region"),
+ G_warning(_("Starting point %d is outside the current region"),
i + 1);
continue;
}
@@ -245,8 +244,7 @@
/* only catches maps out of range until something is found, not after */
if (!have_points) {
- G_warning(_
- ("Starting vector map <%s> contains no points in the current region"),
+ G_warning(_("Starting vector map <%s> contains no points in the current region"),
vpointopt->answers[i]);
}
}
Modified: grass/trunk/raster/r.flow/calc.c
===================================================================
--- grass/trunk/raster/r.flow/calc.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.flow/calc.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -530,8 +530,7 @@
parm.mem = fmem->answer;
if (!pflout->answer && !plgout->answer && !pdsout->answer)
- G_fatal_error(_
- ("You must select one or more output maps (flout, lgout, dsout)"));
+ G_fatal_error(_("You must select one or more output maps (flout, lgout, dsout)"));
if (parm.seg)
parm.mem = '\0';
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.flow/io.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -79,8 +79,7 @@
fd = open_existing_cell_file(parm.elevin, &hd);
if (!((region.ew_res == hd.ew_res)
&& (region.ns_res == hd.ns_res)))
- G_fatal_error(_
- ("Elevation file's resolution differs from current region resolution"));
+ G_fatal_error(_("Elevation file's resolution differs from current region resolution"));
for (row = 0; row < region.rows; row++) {
G_get_d_raster_row(fd, el.buf[row], row);
Modified: grass/trunk/raster/r.gwflow/main.c
===================================================================
--- grass/trunk/raster/r.gwflow/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.gwflow/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -269,14 +269,11 @@
solver = param.solver->answer;
if (strcmp(solver, N_SOLVER_DIRECT_LU) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct LU solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct LU solver do not work with sparse matrices"));
if (strcmp(solver, N_SOLVER_DIRECT_GAUSS) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct Gauss solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct Gauss solver do not work with sparse matrices"));
if (strcmp(solver, N_SOLVER_DIRECT_CHOLESKY) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct cholesky solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct cholesky solver do not work with sparse matrices"));
/*get the current region */
@@ -391,8 +388,7 @@
inner_count = 0;
do {
- G_message(_
- ("Calculation of unconfined groundwater flow loop %i\n"),
+ G_message(_("Calculation of unconfined groundwater flow loop %i\n"),
inner_count + 1);
/* we will allocate a new les for each loop */
@@ -415,8 +411,7 @@
tmp_vect[i] = les->x[i];
}
- G_message(_
- ("Maximum difference between this and last increment: %g"),
+ G_message(_("Maximum difference between this and last increment: %g"),
max_norm);
/* copy the result into the phead array */
@@ -564,8 +559,7 @@
N_solver_gauss(les);
if (les == NULL)
- G_fatal_error(_
- ("Unable to create and solve the linear equation system"));
+ G_fatal_error(_("Unable to create and solve the linear equation system"));
return les;
}
Modified: grass/trunk/raster/r.in.ascii/gethead.c
===================================================================
--- grass/trunk/raster/r.in.ascii/gethead.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.in.ascii/gethead.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -37,8 +37,7 @@
/* read the row and column dimensions */
if (fscanf(fd, "%d %d \n", &nc, &nr) != 2) {
- G_warning(_
- ("error reading the column and row dimension from the Surfer grid file"));
+ G_warning(_("error reading the column and row dimension from the Surfer grid file"));
return 0;
}
@@ -167,8 +166,7 @@
}
}
else
- G_warning(_
- ("ignoring type filed in header, type is set on command line"));
+ G_warning(_("ignoring type filed in header, type is set on command line"));
continue;
}
@@ -180,8 +178,7 @@
}
}
else
- G_warning(_
- ("ignoring multiplier filed in header, multiplier is set on command line"));
+ G_warning(_("ignoring multiplier filed in header, multiplier is set on command line"));
continue;
}
@@ -189,8 +186,7 @@
if (!(*nval)) /* if null val string not set on command line */
*nval = G_store(value);
else
- G_warning(_
- ("ignoring null filed in header, null string is set on command line"));
+ G_warning(_("ignoring null filed in header, null string is set on command line"));
continue;
}
Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.in.bin/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -290,8 +290,7 @@
if (no_coord == 0 && no_dim == 0) { /* Get all parmameters */
if (!parm.north->answer || !parm.south->answer ||
!parm.west->answer || !parm.east->answer)
- G_fatal_error(_
- ("You have to provide all limits of geographic region (n,s,e,w)"));
+ G_fatal_error(_("You have to provide all limits of geographic region (n,s,e,w)"));
if (!G_scan_northing
(parm.north->answer, &cellhd.north, cellhd.proj))
return 1;
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.in.gdal/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -159,8 +159,7 @@
/* -------------------------------------------------------------------- */
if (parm.target->answer && parm.outloc->answer
&& strcmp(parm.target->answer, parm.outloc->answer) == 0) {
- G_fatal_error(_
- ("You have to specify a target location different from output location"));
+ G_fatal_error(_("You have to specify a target location different from output location"));
}
@@ -211,8 +210,7 @@
if (!parm.outloc->answer) { /* Check if the map exists */
if (G_find_cell2(output, G_mapset())) {
if (overwrite)
- G_warning(_
- ("Raster map <%s> already exists and will be overwritten"),
+ G_warning(_("Raster map <%s> already exists and will be overwritten"),
output);
else
G_fatal_error(_("Raster map <%s> already exists"), output);
@@ -306,8 +304,7 @@
/* Projection only required for checking so convert non-interactively */
if (GPJ_wkt_to_grass(&cellhd, &proj_info,
&proj_units, GDALGetProjectionRef(hDS), 0) < 0)
- G_warning(_
- ("Unable to convert input raster map projection information to "
+ G_warning(_("Unable to convert input raster map projection information to "
"GRASS format for checking"));
else {
/* -------------------------------------------------------------------- */
@@ -409,8 +406,7 @@
G_fatal_error(error_msg);
}
else {
- G_message(_
- ("Projection of input dataset and current location "
+ G_message(_("Projection of input dataset and current location "
"appear to match"));
}
}
@@ -615,8 +611,7 @@
GPJ_wkt_to_grass(&cellhd, &proj_info, &proj_units, pszSrcWKT, 0);
if (pj_get_kv(iproj, proj_info, proj_units) < 0)
- G_fatal_error(_
- ("Unable to translate projection key values of input GCPs"));
+ G_fatal_error(_("Unable to translate projection key values of input GCPs"));
/* -------------------------------------------------------------------- */
/* Get the projection of the target location. */
@@ -632,14 +627,11 @@
/* Get projection info from target location */
if ((out_proj_info = G_get_projinfo()) == NULL)
- G_fatal_error(_
- ("Unable to get projection info of target location"));
+ G_fatal_error(_("Unable to get projection info of target location"));
if ((out_unit_info = G_get_projunits()) == NULL)
- G_fatal_error(_
- ("Unable to get projection units of target location"));
+ G_fatal_error(_("Unable to get projection units of target location"));
if (pj_get_kv(oproj, out_proj_info, out_unit_info) < 0)
- G_fatal_error(_
- ("Unable to get projection key values of target location"));
+ G_fatal_error(_("Unable to get projection key values of target location"));
}
else { /* can't access target mapset */
sprintf(errbuf, _("Mapset <%s> in target location <%s> - "),
@@ -912,8 +904,7 @@
/* found 0..255 data: we set to grey scale: */
struct Colors colors;
- G_verbose_message(_
- ("Setting grey color table for <%s> (8bit, full range)"),
+ G_verbose_message(_("Setting grey color table for <%s> (8bit, full range)"),
output);
G_init_colors(&colors);
@@ -926,8 +917,7 @@
struct Range range;
CELL min, max;
- G_verbose_message(_
- ("Setting grey color table for <%s> (16bit, image range)"),
+ G_verbose_message(_("Setting grey color table for <%s> (16bit, image range)"),
output);
G_read_range((char *)output, G_mapset(), &range);
G_get_range_min_max(&range, &min, &max);
Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.in.mat/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -449,8 +449,7 @@
break;
default:
G_close_cell(cf);
- G_fatal_error(_
- ("Please contact the GRASS development team"));
+ G_fatal_error(_("Please contact the GRASS development team"));
}
}
rastline_ptr =
Modified: grass/trunk/raster/r.in.xyz/main.c
===================================================================
--- grass/trunk/raster/r.in.xyz/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.in.xyz/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -382,8 +382,7 @@
if (pth_opt->answer != NULL)
pth = atoi(pth_opt->answer);
else
- G_fatal_error(_
- ("Unable to calculate percentile without the pth option specified!"));
+ G_fatal_error(_("Unable to calculate percentile without the pth option specified!"));
method = METHOD_PERCENTILE;
bin_index = TRUE;
}
@@ -395,8 +394,7 @@
if (trim_opt->answer != NULL)
trim = atof(trim_opt->answer) / 100.0;
else
- G_fatal_error(_
- ("Unable to calculate trimmed mean without the trim option specified!"));
+ G_fatal_error(_("Unable to calculate trimmed mean without the trim option specified!"));
method = METHOD_TRIMMEAN;
bin_index = TRUE;
}
@@ -472,8 +470,7 @@
/* can't rewind() non-files */
if (!can_seek && npasses != 1) {
- G_warning(_
- ("If input is not from a file it is only possible to perform a single pass."));
+ G_warning(_("If input is not from a file it is only possible to perform a single pass."));
npasses = 1;
}
Modified: grass/trunk/raster/r.kappa/calc_kappa.c
===================================================================
--- grass/trunk/raster/r.kappa/calc_kappa.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.kappa/calc_kappa.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -29,8 +29,7 @@
if (output == NULL)
fd = stdout;
else if ((fd = fopen(output, "a")) == NULL) {
- G_fatal_error(_
- ("Cannot open file <%s> to write kappa and relevant parameters"),
+ G_fatal_error(_("Cannot open file <%s> to write kappa and relevant parameters"),
output);
return;
}
Modified: grass/trunk/raster/r.kappa/prt_mat.c
===================================================================
--- grass/trunk/raster/r.kappa/prt_mat.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.kappa/prt_mat.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -36,8 +36,7 @@
fd = stdout;
if (fd == NULL) {
- G_fatal_error(_
- ("Cannot open file <%s> to write cats and counts (error matrix)"),
+ G_fatal_error(_("Cannot open file <%s> to write cats and counts (error matrix)"),
output);
return;
}
Modified: grass/trunk/raster/r.lake/main.c
===================================================================
--- grass/trunk/raster/r.lake/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.lake/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -197,8 +197,7 @@
G_fatal_error(_("Seed map or seed coordinates must be set!"));
if (sdxy_opt->answer && !lake_opt->answer)
- G_fatal_error(_
- ("Seed coordinates and output map lake= must be set!"));
+ G_fatal_error(_("Seed coordinates and output map lake= must be set!"));
if (lake_opt->answer && overwrite_flag->answer)
G_fatal_error(_("Both lake and overwrite cannot be specifed"));
@@ -289,8 +288,7 @@
if (sdxy_opt->answer)
/* Check is water level higher than seed point */
if (in_terran[start_row][start_col] >= water_level)
- G_fatal_error(_
- ("Given water level at seed point is below earth surface. "
+ G_fatal_error(_("Given water level at seed point is below earth surface. "
"Increase water level or move seed point."));
out_water[start_row][start_col] = 1;
@@ -376,8 +374,7 @@
G_message(_("Lake depth from %f to %f"), min_depth, max_depth);
G_message(_("Lake area %f square meters"), area);
G_message(_("Lake volume %f cubic meters"), volume);
- G_warning(_
- ("Volume is correct only if lake depth (terrain raster map) is in meters"));
+ G_warning(_("Volume is correct only if lake depth (terrain raster map) is in meters"));
/* Close all files. Lake map gets written only now. */
G_close_cell(in_terran_fd);
Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -227,8 +227,7 @@
send(child[j].channel, &m);
wait(&status);
if (!(WIFEXITED(status)))
- G_message(_
- ("r.li.worker (pid %i) exited with abnormal status %i"),
+ G_message(_("r.li.worker (pid %i) exited with abnormal status %i"),
donePid, status);
else
G_message(_("r.li.worker (pid %i) terminated"), donePid);
@@ -249,8 +248,7 @@
send(child[i].channel, &m);
wait(&status);
if (!(WIFEXITED(status)))
- G_message(_
- ("r.li.worker (pid %i) exited with abnormal status %i"),
+ G_message(_("r.li.worker (pid %i) exited with abnormal status %i"),
child[i].pid, status);
else
G_message(_("r.li.worker (pid %i) terminated"), child[i].pid);
Modified: grass/trunk/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/worker.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.li/r.li.daemon/worker.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -136,8 +136,7 @@
ad->mask_name = mask_preprocessing(toReceive.f.f_ma.mask,
raster, ad->rl, ad->cl);
if (ad->mask_name == NULL) {
- G_message(_
- ("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
+ G_message(_("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
pid, toReceive.f.f_ma.mask);
ad->mask = -1;
}
@@ -147,8 +146,7 @@
erease_mask = 1;
ad->mask = open(ad->mask_name, O_WRONLY, 0755);
if (ad->mask == -1) {
- G_message(_
- ("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
+ G_message(_("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
pid, toReceive.f.f_ma.mask);
}
Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.los/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -145,14 +145,12 @@
patt_flag = TRUE;
if ((G_projection() == PROJECTION_LL))
- G_fatal_error(_
- ("Lat/Long support is not (yet) implemented for this module."));
+ G_fatal_error(_("Lat/Long support is not (yet) implemented for this module."));
/* check if specified observer location inside window */
if (east < window.west || east > window.east
|| north > window.north || north < window.south)
- G_fatal_error(_
- ("Specified observer coordinate is outside current region bounds."));
+ G_fatal_error(_("Specified observer coordinate is outside current region bounds."));
search_mapset = "";
old_mapset = G_find_cell2(elev_layer, search_mapset);
@@ -242,8 +240,7 @@
G_get_ellipsoid_parameters(&aa, &e2);
if (aa == 0) {
/* since there was a problem, take a hardcoded radius :( */
- G_warning(_
- ("Problem to obtain current ellipsoid parameters, using sphere (6370997.0)"));
+ G_warning(_("Problem to obtain current ellipsoid parameters, using sphere (6370997.0)"));
aa = 6370997.00;
}
G_debug(3, "radius: %f", aa);
Modified: grass/trunk/raster/r.mfilter/main.c
===================================================================
--- grass/trunk/raster/r.mfilter/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.mfilter/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -113,8 +113,7 @@
/* make sure filter matrix won't extend outside the raster map */
for (i = 0; i < nfilters; i++) {
if (filter[i].size > ncols || filter[i].size > nrows)
- G_fatal_error(_
- ("Raster map too small for the size of the filter"));
+ G_fatal_error(_("Raster map too small for the size of the filter"));
}
Modified: grass/trunk/raster/r.mfilter.fp/main.c
===================================================================
--- grass/trunk/raster/r.mfilter.fp/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.mfilter.fp/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -120,8 +120,7 @@
/* make sure filter matrix won't extend outside the raster map */
for (i = 0; i < nfilters; i++) {
if (filter[i].size > ncols || filter[i].size > nrows)
- G_fatal_error(_
- ("Raster map too small for the size of the filter"));
+ G_fatal_error(_("Raster map too small for the size of the filter"));
}
Modified: grass/trunk/raster/r.out.gdal/main.c
===================================================================
--- grass/trunk/raster/r.out.gdal/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.out.gdal/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -336,14 +336,12 @@
if (n_nulls > 0) {
if (maptype == CELL_TYPE)
- G_warning(_
- ("Input raster map constains cells with NULL-value (no-data). "
+ G_warning(_("Input raster map constains cells with NULL-value (no-data). "
"The value %d was used to represent no-data values in the input map."
"You can specify nodata value by %s parameter."),
(int)nodataval, nodatakey);
else
- G_warning(_
- ("Input raster map constains cells with NULL-value (no-data). "
+ G_warning(_("Input raster map constains cells with NULL-value (no-data). "
"The value %g was used to represent no-data values in the input map."
"You can specify nodata value by %s parameter."),
nodataval, nodatakey);
@@ -686,8 +684,7 @@
GDALCreate(hDriver, output->answer, cellhead.cols, cellhead.rows,
ref.nfiles, datatype, papszOptions);
if (hDstDS == NULL)
- G_fatal_error(_
- ("Unable to create <%s> dataset using <%s> driver"),
+ G_fatal_error(_("Unable to create <%s> dataset using <%s> driver"),
output->answer, format->answer);
hCurrDS = hDstDS;
}
@@ -738,8 +735,7 @@
GDALCreateCopy(hDriver, output->answer, hMEMDS, FALSE,
papszOptions, NULL, NULL);
if (hDstDS == NULL)
- G_fatal_error(_
- ("Unable to create raster map <%s> using driver <%s>"),
+ G_fatal_error(_("Unable to create raster map <%s> using driver <%s>"),
output->answer, format->answer);
}
Modified: grass/trunk/raster/r.out.pov/main.c
===================================================================
--- grass/trunk/raster/r.out.pov/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.out.pov/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -190,8 +190,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
if (nrows > YMAX || ncols > XMAX)
- G_fatal_error(_
- ("Raster map is too big! Exceeds %d columns or %d rows"),
+ G_fatal_error(_("Raster map is too big! Exceeds %d columns or %d rows"),
XMAX, YMAX);
Modified: grass/trunk/raster/r.out.vtk/main.c
===================================================================
--- grass/trunk/raster/r.out.vtk/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.out.vtk/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -83,8 +83,7 @@
}
}
else {
- G_fatal_error(_
- ("Cannot create RGB data, please provide three maps [r,g,b]"));
+ G_fatal_error(_("Cannot create RGB data, please provide three maps [r,g,b]"));
}
}
@@ -107,8 +106,7 @@
}
}
else {
- G_fatal_error(_
- ("Cannot create vector data, please provide three maps [x,y,z]"));
+ G_fatal_error(_("Cannot create vector data, please provide three maps [x,y,z]"));
}
}
@@ -333,8 +331,7 @@
digits);
}
else {
- G_warning(_
- ("Wrong RGB maps. Maps should have the same type! RGB output not added!"));
+ G_warning(_("Wrong RGB maps. Maps should have the same type! RGB output not added!"));
/*do nothing */
}
@@ -381,8 +378,7 @@
digits);
}
else {
- G_warning(_
- ("Wrong vector maps. Maps should have the same type! Vector output not added!"));
+ G_warning(_("Wrong vector maps. Maps should have the same type! Vector output not added!"));
/*do nothing */
}
Modified: grass/trunk/raster/r.out.vtk/writeascii.c
===================================================================
--- grass/trunk/raster/r.out.vtk/writeascii.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.out.vtk/writeascii.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -426,8 +426,7 @@
/*Test of valuerange, the data should be 1 byte gray values */
if (r > 255 || g > 255 || b > 255 || r < 0 || g < 0 || b < 0) {
- G_warning(_
- ("Wrong map values! Values should in between 0 and 255!\n"));
+ G_warning(_("Wrong map values! Values should in between 0 and 255!\n"));
fprintf(fp, "0 0 0 \n");
}
else {
Modified: grass/trunk/raster/r.param.scale/interface.c
===================================================================
--- grass/trunk/raster/r.param.scale/interface.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.param.scale/interface.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -160,8 +160,7 @@
else if (!strcmp(parameter->answer, "feature"))
mparam = FEATURE;
else {
- G_warning(_
- ("Morphometric parameter not recognised. Assuming 'Elevation'"));
+ G_warning(_("Morphometric parameter not recognised. Assuming 'Elevation'"));
mparam = ELEV;
}
Modified: grass/trunk/raster/r.param.scale/process.c
===================================================================
--- grass/trunk/raster/r.param.scale/process.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.param.scale/process.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -69,8 +69,7 @@
if ((region.ew_res / region.ns_res >= 1.01) || /* If EW and NS resolns are */
(region.ns_res / region.ew_res >= 1.01)) { /* >1% different, warn user. */
- G_warning(_
- ("E-W and N-S grid resolutions are different. Taking average."));
+ G_warning(_("E-W and N-S grid resolutions are different. Taking average."));
resoln = (region.ns_res + region.ew_res) / 2;
}
else
Modified: grass/trunk/raster/r.profile/main.c
===================================================================
--- grass/trunk/raster/r.profile/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.profile/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -241,8 +241,7 @@
G_message(_("Approx. transect length [%f] m"), LEN);
if (!G_point_in_region(e2, n2))
- G_warning(_
- ("Endpoint coordinates are outside of current region settings"));
+ G_warning(_("Endpoint coordinates are outside of current region settings"));
/* Calculate Azimuth of Line */
if (rows == 0 && cols == 0) {
Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.proj/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -213,16 +213,13 @@
/* Get projection info for output mapset */
if ((out_proj_info = G_get_projinfo()) == NULL)
- G_fatal_error(_
- ("Unable to get projection info of output raster map"));
+ G_fatal_error(_("Unable to get projection info of output raster map"));
if ((out_unit_info = G_get_projunits()) == NULL)
- G_fatal_error(_
- ("Unable to get projection units of output raster map"));
+ G_fatal_error(_("Unable to get projection units of output raster map"));
if (pj_get_kv(&oproj, out_proj_info, out_unit_info) < 0)
- G_fatal_error(_
- ("Unable to get projection key values of output raster map"));
+ G_fatal_error(_("Unable to get projection key values of output raster map"));
/* Change the location */
G__create_alt_env();
@@ -249,8 +246,7 @@
G_fatal_error(_("Required parameter <%s> not set"), inmap->key);
if (!G_find_cell(inmap->answer, setname))
- G_fatal_error(_
- ("Raster map <%s> in location <%s> in mapset <%s> not found"),
+ G_fatal_error(_("Raster map <%s> in location <%s> in mapset <%s> not found"),
inmap->answer, inlocation->answer, setname);
/* Read input map colour table */
@@ -278,8 +274,7 @@
G_set_window(&incellhd);
if (G_projection() == PROJECTION_XY)
- G_fatal_error(_
- ("Unable to work with unprojected data (xy location)"));
+ G_fatal_error(_("Unable to work with unprojected data (xy location)"));
/* Save default borders so we can show them later */
inorth = incellhd.north;
Modified: grass/trunk/raster/r.proj.seg/main.c
===================================================================
--- grass/trunk/raster/r.proj.seg/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.proj.seg/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -219,23 +219,19 @@
setname = imapset->answer ? imapset->answer : G_store(G_mapset());
if (strcmp(inlocation->answer, G_location()) == 0)
- G_fatal_error(_
- ("You have to use a different location for input than the current"));
+ G_fatal_error(_("You have to use a different location for input than the current"));
G_get_window(&outcellhd);
/* Get projection info for output mapset */
if ((out_proj_info = G_get_projinfo()) == NULL)
- G_fatal_error(_
- ("Unable to get projection info of output raster map"));
+ G_fatal_error(_("Unable to get projection info of output raster map"));
if ((out_unit_info = G_get_projunits()) == NULL)
- G_fatal_error(_
- ("Unable to get projection units of output raster map"));
+ G_fatal_error(_("Unable to get projection units of output raster map"));
if (pj_get_kv(&oproj, out_proj_info, out_unit_info) < 0)
- G_fatal_error(_
- ("Unable to get projection key values of output raster map"));
+ G_fatal_error(_("Unable to get projection key values of output raster map"));
/* Change the location */
G__create_alt_env();
@@ -262,8 +258,7 @@
G_fatal_error(_("Required parameter <%s> not set"), inmap->key);
if (!G_find_cell(inmap->answer, setname))
- G_fatal_error(_
- ("Raster map <%s> in location <%s> in mapset <%s> not found"),
+ G_fatal_error(_("Raster map <%s> in location <%s> in mapset <%s> not found"),
inmap->answer, inlocation->answer, setname);
/* Read input map colour table */
@@ -291,8 +286,7 @@
G_set_window(&incellhd);
if (G_projection() == PROJECTION_XY)
- G_fatal_error(_
- ("Unable to work with unprojected data (xy location)"));
+ G_fatal_error(_("Unable to work with unprojected data (xy location)"));
/* Save default borders so we can show them later */
inorth = incellhd.north;
Modified: grass/trunk/raster/r.random/main.c
===================================================================
--- grass/trunk/raster/r.random/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.random/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -171,18 +171,15 @@
else {
if (targets > count) {
if (myState.use_nulls)
- G_fatal_error(_
- ("There aren't [%ld] cells in the current region"),
+ G_fatal_error(_("There aren't [%ld] cells in the current region"),
targets);
else
- G_fatal_error(_
- ("There aren't [%ld] non-NULL cells in the current region"),
+ G_fatal_error(_("There aren't [%ld] non-NULL cells in the current region"),
targets);
}
if (targets <= 0)
- G_fatal_error(_
- ("There are no valid locations in the current region"));
+ G_fatal_error(_("There are no valid locations in the current region"));
myState.nRand = targets;
}
Modified: grass/trunk/raster/r.random/random.c
===================================================================
--- grass/trunk/raster/r.random/random.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.random/random.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -124,15 +124,13 @@
for (row = 0; row < nrows && nt; row++) {
if (G_get_raster_row
(infd, theState->buf.data.v, row, theState->buf.type) < 0)
- G_fatal_error(_
- ("Cannot read raster row [%d] from raster map <%s>"),
+ G_fatal_error(_("Cannot read raster row [%d] from raster map <%s>"),
row, theState->inraster);
if (theState->docover == 1) {
if (G_get_raster_row
(cinfd, theState->cover.data.v, row,
theState->cover.type) < 0)
- G_fatal_error(_
- ("Cannot read raster row [%d] from cover raster map <%s>"),
+ G_fatal_error(_("Cannot read raster row [%d] from cover raster map <%s>"),
row, theState->inrcover);
}
Modified: grass/trunk/raster/r.random.surface/main.c
===================================================================
--- grass/trunk/raster/r.random.surface/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.random.surface/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -70,8 +70,7 @@
for (DoFilter = 0; DoFilter < NumFilters; DoFilter++) {
CopyFilter(&Filter, AllFilters[DoFilter]);
- G_message(_
- ("Starting filter #%d, distance: %.*lf, exponent: %.*lf, flat: %.*lf"),
+ G_message(_("Starting filter #%d, distance: %.*lf, exponent: %.*lf, flat: %.*lf"),
DoFilter, Digits(2.0 * Filter.MaxDist, 6),
2.0 * Filter.MaxDist, Digits(1.0 / Filter.Exp, 6),
1.0 / Filter.Exp, Digits(Filter.Mult, 6), Filter.Mult);
Modified: grass/trunk/raster/r.reclass/main.c
===================================================================
--- grass/trunk/raster/r.reclass/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.reclass/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -136,8 +136,7 @@
if (!any) {
if (tty)
- G_fatal_error(_
- ("No rules specified. Raster map <%s> not created"),
+ G_fatal_error(_("No rules specified. Raster map <%s> not created"),
parm.output->answer);
else
G_fatal_error(_("No rules specified"));
Modified: grass/trunk/raster/r.reclass/parse.c
===================================================================
--- grass/trunk/raster/r.reclass/parse.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.reclass/parse.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -55,8 +55,7 @@
if (!scan_value(&v))
return -1;
if (G_is_c_null_value(&v)) {
- G_warning(_
- ("Can't have null on the left-hand side of the rule"));
+ G_warning(_("Can't have null on the left-hand side of the rule"));
return -1;
}
state = 1;
@@ -85,8 +84,7 @@
if (strncmp(cur, "thru", 4) != 0)
continue;
if (last_null) {
- G_warning(_
- ("Can't have null on the right-hand side of the rule"));
+ G_warning(_("Can't have null on the right-hand side of the rule"));
return -1;
}
cur += 4;
@@ -98,8 +96,7 @@
if (!scan_value(&v))
return -1;
if (G_is_c_null_value(&v)) {
- G_warning(_
- ("Can't have null on the right-hand side of the rule"));
+ G_warning(_("Can't have null on the right-hand side of the rule"));
return -1;
}
Modified: grass/trunk/raster/r.recode/main.c
===================================================================
--- grass/trunk/raster/r.recode/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.recode/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -97,8 +97,7 @@
if (!read_rules(srcfp)) {
if (isatty(fileno(srcfp)))
- G_fatal_error(_
- ("No rules specified. Raster map <%s> not created."),
+ G_fatal_error(_("No rules specified. Raster map <%s> not created."),
result);
else
G_fatal_error(_("No rules specified"));
Modified: grass/trunk/raster/r.recode/read_rules.c
===================================================================
--- grass/trunk/raster/r.recode/read_rules.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.recode/read_rules.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -79,12 +79,9 @@
if (strcmp(buf, "help") == 0) {
G_message(_("Enter a rule in one of these formats:"));
G_message(_("old_low:old_high:new_low:new_high"));
- G_message(_
- ("old_low:old_high:new_val (i.e. new_high == new_low)"));
- G_message(_
- ("*:old_val:new_val (interval [inf, old_val])"));
- G_message(_
- ("old_val:*:new_val (interval [old_val, inf])"));
+ G_message(_("old_low:old_high:new_val (i.e. new_high == new_low)"));
+ G_message(_("*:old_val:new_val (interval [inf, old_val])"));
+ G_message(_("old_val:*:new_val (interval [old_val, inf])"));
continue;
}
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.resamp.rst/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -343,8 +343,7 @@
if (sscanf(parm.scalex->answer, "%lf", &scalex) != 1)
G_fatal_error(_("Invalid value for scalex"));
if (!parm.theta->answer)
- G_fatal_error(_
- ("When using anisotropy both theta and scalex must be specified"));
+ G_fatal_error(_("When using anisotropy both theta and scalex must be specified"));
}
/*
@@ -432,8 +431,7 @@
G_fatal_error(_("[%s]: Cannot read map header"), input);
if ((winhd.ew_res != inphd.ew_res) || (winhd.ns_res != inphd.ns_res))
- G_fatal_error(_
- ("Input map resolution differs from current region resolution!"));
+ G_fatal_error(_("Input map resolution differs from current region resolution!"));
if ((fdinp = G_open_cell_old(input, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), input);
@@ -525,8 +523,7 @@
/* change region to initial region */
G_message(_("Changing back to the original region ..."));
if (G_set_window(&winhd) < 0)
- G_fatal_error(_
- ("Cannot set region to back to the initial region !!!"));
+ G_fatal_error(_("Cannot set region to back to the initial region !!!"));
ertot = 0.;
cursegm = 0;
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.slope.aspect/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -1018,8 +1018,7 @@
G_set_raster_cats_title
("Aspect counterclockwise in degrees from east", &cats);
- G_verbose_message(_
- ("Min computed aspect %.4f, max computed aspect %.4f"),
+ G_verbose_message(_("Min computed aspect %.4f, max computed aspect %.4f"),
min_asp, max_asp);
/* the categries quant intervals are 1.0 long, plus
we are using reverse order so that the label looked up
@@ -1123,8 +1122,7 @@
else if (perc)
G_set_raster_cats_title("percent slope", &cats);
- G_verbose_message(_
- ("Min computed slope %.4f, max computed slope %.4f"),
+ G_verbose_message(_("Min computed slope %.4f, max computed slope %.4f"),
min_slp, max_slp);
/* the categries quant intervals are 1.0 long, plus
we are using reverse order so that the label looked up
Modified: grass/trunk/raster/r.statistics/main.c
===================================================================
--- grass/trunk/raster/r.statistics/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.statistics/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -79,15 +79,13 @@
G_fatal_error(_("Raster map <%s> not found"), basemap->answer);
if (G_raster_map_is_fp(basemap->answer, mapset) != 0)
- G_fatal_error(_
- ("This module currently only works for integer (CELL) maps"));
+ G_fatal_error(_("This module currently only works for integer (CELL) maps"));
if ((mapset = G_find_cell2(covermap->answer, "")) == 0)
G_fatal_error(_("Raster map <%s> not found"), covermap->answer);
if (G_raster_map_is_fp(covermap->answer, mapset) != 0)
- G_fatal_error(_
- ("This module currently only works for integer (CELL) maps"));
+ G_fatal_error(_("This module currently only works for integer (CELL) maps"));
if (G_read_cats(covermap->answer, mapset, &cats) < 0) {
G_fatal_error(_("Unable to read category file of raster map <%s@%s>"),
@@ -186,8 +184,7 @@
static int is_ok(char *method, char *map)
{
if (map == NULL)
- G_fatal_error(_
- ("An output raster map needs to be defined with method '%s'"),
+ G_fatal_error(_("An output raster map needs to be defined with method '%s'"),
method);
return 0;
Modified: grass/trunk/raster/r.stats/main.c
===================================================================
--- grass/trunk/raster/r.stats/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.stats/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -287,24 +287,21 @@
G_quant_init(&q);
if (cat_ranges) {
if (!G_quant_nof_rules(&labels[nfiles].q)) {
- G_warning(_
- ("Cats for raster map <%s> are either missing or have no explicit labels. "
+ G_warning(_("Cats for raster map <%s> are either missing or have no explicit labels. "
"Using %s=%d."), G_fully_qualified_name(name,
mapset),
option.nsteps->key, nsteps);
cat_ranges = 0;
}
else if (nsteps != 255)
- G_warning(_
- ("Flag '-%c' was given, using cats fp ranges of raster map <%s>, "
+ G_warning(_("Flag '-%c' was given, using cats fp ranges of raster map <%s>, "
"ignoring '%s' option"), flag.C->key,
G_fully_qualified_name(name, mapset),
option.nsteps->key);
}
if (!cat_ranges) { /* DO NOT use else here, cat_ranges can change */
if (G_read_fp_range(name, mapset, &fp_range) < 0)
- G_fatal_error(_
- ("Unable to read fp range of raster map <%s>"),
+ G_fatal_error(_("Unable to read fp range of raster map <%s>"),
G_fully_qualified_name(name, mapset));
G_get_fp_range_min_max(&fp_range, &DMIN[nfiles],
&DMAX[nfiles]);
Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.sun/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -425,15 +425,13 @@
if (parm.ltime->answer != NULL) {
if (insol_time != NULL)
G_fatal_error(_("time and insol_time are incompatible options"));
- G_message(_
- ("Mode 1: instantaneous solar incidence angle & irradiance given a set local time"));
+ G_message(_("Mode 1: instantaneous solar incidence angle & irradiance given a set local time"));
sscanf(parm.ltime->answer, "%lf", &timo);
}
else {
if (incidout != NULL)
G_fatal_error(_("incidout requires time parameter to be set"));
- G_message(_
- ("Mode 2: integrated daily irradiation for a given day of the year"));
+ G_message(_("Mode 2: integrated daily irradiation for a given day of the year"));
}
if (parm.linkein->answer == NULL)
@@ -482,12 +480,10 @@
if ((in_proj_info = G_get_projinfo()) == NULL)
G_fatal_error
- (_
- ("Can't get projection info of current location: please set latitude via 'lat' or 'latin' option!"));
+ (_("Can't get projection info of current location: please set latitude via 'lat' or 'latin' option!"));
if ((in_unit_info = G_get_projunits()) == NULL)
- G_fatal_error(_
- ("Can't get projection units of current location"));
+ G_fatal_error(_("Can't get projection units of current location"));
if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0)
G_fatal_error
@@ -501,8 +497,7 @@
oproj.meters = 1.;
sprintf(oproj.proj, "ll");
if ((oproj.pj = pj_latlong_from_proj(iproj.pj)) == NULL)
- G_fatal_error(_
- ("Unable to set up lat/long projection parameters"));
+ G_fatal_error(_("Unable to set up lat/long projection parameters"));
}
Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.sunmask/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -286,23 +286,19 @@
locparms = 0;
if (solparms && locparms) /* both defined */
- G_fatal_error(_
- ("Either define sun position or location/date/time parameters."));
+ G_fatal_error(_("Either define sun position or location/date/time parameters."));
if (!solparms && !locparms) /* nothing defined */
- G_fatal_error(_
- ("Neither sun position nor east/north, date/time/timezone definition are complete."));
+ G_fatal_error(_("Neither sun position nor east/north, date/time/timezone definition are complete."));
/* if here, one definition was complete */
if (locparms) {
- G_message(_
- ("Calculating sun position... (using solpos (V. %s) from NREL)\n"),
+ G_message(_("Calculating sun position... (using solpos (V. %s) from NREL)\n"),
SOLPOSVERSION);
use_solpos = 1;
}
else {
- G_message(_
- ("Using user defined sun azimuth, altitude settings (ignoring eventual other values)\n"));
+ G_message(_("Using user defined sun azimuth, altitude settings (ignoring eventual other values)\n"));
use_solpos = 0;
}
@@ -383,8 +379,7 @@
}
}
else {
- G_message(_
- (" %d.%02d.%02d, daynum %d, time: %02i:%02i:%02i (decimal time: %f)\n"),
+ G_message(_(" %d.%02d.%02d, daynum %d, time: %02i:%02i:%02i (decimal time: %f)\n"),
pdat->year, pdat->month, pdat->day,
pdat->daynum, pdat->hour, pdat->minute,
pdat->second,
@@ -394,16 +389,13 @@
G_message(_(" long: %f, lat: %f, timezone: %f\n"),
pdat->longitude, pdat->latitude,
pdat->timezone);
- G_message(_
- (" Solar position: sun azimuth: %f,\n sun angle above horz.(refraction corrected): %f\n"),
+ G_message(_(" Solar position: sun azimuth: %f,\n sun angle above horz.(refraction corrected): %f\n"),
pdat->azim, pdat->elevref);
if (sretr / 60 <= 24.0) {
- G_message(_
- (" Sunrise time (without refraction): %02d:%02d:%02d\n"),
+ G_message(_(" Sunrise time (without refraction): %02d:%02d:%02d\n"),
sretr / 60, sretr % 60, sretr_sec);
- G_message(_
- (" Sunset time (without refraction): %02d:%02d:%02d\n"),
+ G_message(_(" Sunset time (without refraction): %02d:%02d:%02d\n"),
ssetr / 60, ssetr % 60, ssetr_sec);
}
}
@@ -428,8 +420,7 @@
G_debug(3, "current_time:%f sunrise:%f", current_time, sunrise);
if ((current_time < sunrise)) {
if (sretr / 60 <= 24.0)
- G_message(_
- ("Time (%02i:%02i:%02i) is before sunrise (%02d:%02d:%02d)!\n"),
+ G_message(_("Time (%02i:%02i:%02i) is before sunrise (%02d:%02d:%02d)!\n"),
pdat->hour, pdat->minute, pdat->second, sretr / 60,
sretr % 60, sretr_sec);
else
@@ -440,8 +431,7 @@
}
if ((current_time > sunset)) {
if (sretr / 60 <= 24.0)
- G_message(_
- ("Time (%02i:%02i:%02i) is after sunset (%02d:%02d:%02d)!\n"),
+ G_message(_("Time (%02i:%02i:%02i) is after sunset (%02d:%02d:%02d)!\n"),
pdat->hour, pdat->minute, pdat->second, ssetr / 60,
ssetr % 60, ssetr_sec);
else
Modified: grass/trunk/raster/r.support/front/front.c
===================================================================
--- grass/trunk/raster/r.support/front/front.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.support/front/front.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -227,8 +227,7 @@
G_fatal_error(_("Unable to open raster map <%s>"), infile);
G_init_cats((CELL) 0, "", &cats);
if (0 > G_read_cats(map_opt->answer, cmapset, &cats))
- G_fatal_error(_
- ("Unable to read category file of raster map <%s@%s>"),
+ G_fatal_error(_("Unable to read category file of raster map <%s@%s>"),
map_opt->answer, cmapset);
if (G_write_cats(infile, &cats) >= 0)
Modified: grass/trunk/raster/r.support/modhead/modhead.c
===================================================================
--- grass/trunk/raster/r.support/modhead/modhead.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.support/modhead/modhead.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -83,13 +83,11 @@
/* Make sure map is not reclassed */
if (G_is_reclass(name, mapset, rname, rmapset) > 0) {
if (strcmp(mapset, rmapset) == 0)
- G_fatal_error(_
- ("[%s] is a reclass of [%s] - cannot edit header! Run support on [%s]."),
+ G_fatal_error(_("[%s] is a reclass of [%s] - cannot edit header! Run support on [%s]."),
name, rname, rname);
/* ELSE */
- G_fatal_error(_
- ("[%s] is a reclass of [%s in %s] - cannot edit header!"),
+ G_fatal_error(_("[%s] is a reclass of [%s in %s] - cannot edit header!"),
name, rname, rmapset);
}
@@ -206,8 +204,7 @@
if ((compressed_new || compressed_old) && G_yes(buffer, -1)) {
if (compressed_new && compressed_old) {
while (1) {
- G_message(_
- ("Please indicate the type of compression:\n"));
+ G_message(_("Please indicate the type of compression:\n"));
G_message(_(" 1. Pre 3.0 compression\n"));
G_message(_(" 2. 3.0 compression\n"));
if (!G_gets(buffer))
@@ -245,12 +242,10 @@
cellhd.compressed = 0;
if ((cellhd.compressed == 0) && compressed_new) {
- G_warning(_
- ("The header for [%s] says the file is not compressed. "),
+ G_warning(_("The header for [%s] says the file is not compressed. "),
name);
G_warning(_("The file appears to be compressed.\n"));
- G_warning(_
- ("Most likely the header is wrong, but I want you to decide.\n"));
+ G_warning(_("Most likely the header is wrong, but I want you to decide.\n"));
if (G_yes("Is the file compressed? ", -1))
cellhd.compressed = 1;
@@ -259,8 +254,7 @@
G_warning(_("The header for [%s] says the file is compressed. "),
name);
G_warning(_("The file does NOT appear to be compressed.\n"));
- G_warning(_
- ("Most likely the header is wrong, but I want you to decide.\n"));
+ G_warning(_("Most likely the header is wrong, but I want you to decide.\n"));
if (!G_yes("Is the file really compressed? ", -1))
cellhd.compressed = 0;
Modified: grass/trunk/raster/r.support/modhist/modhist.c
===================================================================
--- grass/trunk/raster/r.support/modhist/modhist.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.support/modhist/modhist.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -35,8 +35,7 @@
if (argc < 2) {
mapset =
- G_ask_cell_in_mapset(_
- ("Which raster map needs an updated history? "),
+ G_ask_cell_in_mapset(_("Which raster map needs an updated history? "),
name);
if (mapset == NULL)
return EXIT_SUCCESS;
Modified: grass/trunk/raster/r.surf.fractal/interface.c
===================================================================
--- grass/trunk/raster/r.surf.fractal/interface.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.surf.fractal/interface.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -95,8 +95,7 @@
/*--------------------------------------------------------------------*/
if ((H <= 0) || (H >= 1)) {
- G_fatal_error(_
- ("Fractal dimension of [%.2lf] must be between 2 and 3."),
+ G_fatal_error(_("Fractal dimension of [%.2lf] must be between 2 and 3."),
3.0 - H);
}
Modified: grass/trunk/raster/r.surf.idw2/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.surf.idw2/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -77,8 +77,7 @@
/* Make sure that the current projection is not lat/long */
if ((G_projection() == PROJECTION_LL))
- G_fatal_error(_
- ("Lat/long databases not supported by r.surf.idw2. Use r.surf.idw instead!"));
+ G_fatal_error(_("Lat/long databases not supported by r.surf.idw2. Use r.surf.idw instead!"));
if (G_legal_filename(parm.output->answer) < 0)
G_fatal_error(_("<%s> is an illegal file name"), parm.output->answer);
Modified: grass/trunk/raster/r.texture/h_measure.c
===================================================================
--- grass/trunk/raster/r.texture/h_measure.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.texture/h_measure.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -924,8 +924,7 @@
}
else {
if (its == 30)
- G_fatal_error(_
- ("Too many iterations to required to find %s - giving up"),
+ G_fatal_error(_("Too many iterations to required to find %s - giving up"),
F14), exit(1);
if (its == 10 || its == 20) {
t += x;
Modified: grass/trunk/raster/r.texture/main.c
===================================================================
--- grass/trunk/raster/r.texture/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.texture/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -205,8 +205,7 @@
if (a && c && corr && v && idm && sa && sv && se && e && dv && de && moc1
&& moc2 && mcc)
- G_fatal_error(_
- ("Nothing to compute. Use at least one of the flags."));
+ G_fatal_error(_("Nothing to compute. Use at least one of the flags."));
/* find map in mapset */
mapset = G_find_cell2(name, "");
@@ -339,8 +338,7 @@
for (j = 0; j < (size / 2); j++)
if (G_put_raster_row(outfd, outrast, out_data_type) <
0)
- G_fatal_error(_
- ("Failed writing raster map <%s> row %d"),
+ G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
if (G_put_raster_row(outfd, outrast, out_data_type) < 0)
@@ -351,13 +349,11 @@
if ((row >= nrows - (size - 1)) && (row < nrows))
for (j = 0; j < (size / 2); j++)
if (G_put_raster_row(outfd, outrast, out_data_type) < 0)
- G_fatal_error(_
- ("Failed writing raster map <%s> row %d"),
+ G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
G_close_cell(outfd);
- G_important_message(_
- ("Calculated measure #%d (56 measures available)"),
+ G_important_message(_("Calculated measure #%d (56 measures available)"),
(t_measure + 1));
}
G_free(outrast);
Modified: grass/trunk/raster/r.thin/io.c
===================================================================
--- grass/trunk/raster/r.thin/io.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.thin/io.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -112,8 +112,7 @@
close(creat(work_file_name, 0666));
if ((work_file = open(work_file_name, 2)) < 0) {
unlink(work_file_name);
- G_fatal_error(_
- ("%s: Unable to create temporary file <%s> -- errno = %d"),
+ G_fatal_error(_("%s: Unable to create temporary file <%s> -- errno = %d"),
error_prefix, work_file_name, errno);
}
buf = (CELL *) G_malloc(buf_len = n_cols * sizeof(CELL));
@@ -129,8 +128,7 @@
for (row = 0; row < n_rows; row++) {
if (G_get_map_row(cell_file, buf + PAD, row) < 0) {
unlink(work_file_name);
- G_fatal_error(_
- ("%s: Error reading from raster map <%s> in mapset <%s>"),
+ G_fatal_error(_("%s: Error reading from raster map <%s> in mapset <%s>"),
error_prefix, cell, mapset);
}
if (write(work_file, buf, buf_len) != buf_len) {
Modified: grass/trunk/raster/r.thin/thin_lines.c
===================================================================
--- grass/trunk/raster/r.thin/thin_lines.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.thin/thin_lines.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -173,8 +173,7 @@
if ((deleted == 0) && (i <= iterations))
G_message(_("Thinning completed successfully."));
else
- G_message(_
- ("Thinning not completed, consider to increase 'iterations' parameter."));
+ G_message(_("Thinning not completed, consider to increase 'iterations' parameter."));
return 0;
}
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.to.rast3/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -219,8 +219,7 @@
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
- G_message(_
- ("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
+ G_message(_("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -135,8 +135,7 @@
}
if (elevcount != inputcount) {
- G_fatal_error(_
- ("The number of input and elevation maps is not equal"));
+ G_fatal_error(_("The number of input and elevation maps is not equal"));
exit(EXIT_FAILURE);
}
@@ -461,8 +460,7 @@
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
- G_message(_
- ("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
+ G_message(_("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
Modified: grass/trunk/raster/r.to.vect/lines.c
===================================================================
--- grass/trunk/raster/r.to.vect/lines.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.to.vect/lines.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -490,8 +490,7 @@
break;
default:
G_debug(1, "Crowded cell %xH (%d,%d)", count, row, col);
- G_fatal_error(_
- ("Raster map is not thinned properly.\nPlease run r.thin."));
+ G_fatal_error(_("Raster map is not thinned properly.\nPlease run r.thin."));
} /* switch count */
return 0;
Modified: grass/trunk/raster/r.to.vect/main.c
===================================================================
--- grass/trunk/raster/r.to.vect/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.to.vect/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -107,8 +107,7 @@
G_get_window(&cell_head);
if (value_flag && data_type != CELL_TYPE) {
- G_warning(_
- ("Raster is not CELL, '-v' flag ignored, raster values will be written to the table."));
+ G_warning(_("Raster is not CELL, '-v' flag ignored, raster values will be written to the table."));
value_flag = 0;
}
Modified: grass/trunk/raster/r.topidx/main.c
===================================================================
--- grass/trunk/raster/r.topidx/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.topidx/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -52,8 +52,7 @@
/* Make sure that the current projection is not lat/long */
if ((G_projection() == PROJECTION_LL))
- G_fatal_error(_
- ("Lat/Long location is not supported by %s. Please reproject map first."),
+ G_fatal_error(_("Lat/Long location is not supported by %s. Please reproject map first."),
G_program_name());
iname = params.input->answer;
Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.walk/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -493,8 +493,7 @@
if (!G_is_d_null_value(&null_cost)) {
if (null_cost < 0.0) {
- G_warning(_
- ("Warning: assigning negative cost to null cell. Null cells excluded."));
+ G_warning(_("Warning: assigning negative cost to null cell. Null cells excluded."));
G_set_d_null_value(&null_cost, 1);
}
}
@@ -819,8 +818,7 @@
fbuff = (double *)G_malloc((unsigned int)(ncols * sizeof(double)));
if (fbuff == NULL)
- G_fatal_error(_
- ("Unable to allocate memory for segment fbuff == NULL"));
+ G_fatal_error(_("Unable to allocate memory for segment fbuff == NULL"));
G_set_d_null_value(fbuff, ncols);
@@ -849,8 +847,7 @@
cum_cost_mapset = G_find_cell2(cum_cost_layer, search_mapset);
if (cum_cost_mapset == NULL)
- G_fatal_error(_
- ("Raster output map <%s> not found (no start_points given)"),
+ G_fatal_error(_("Raster output map <%s> not found (no start_points given)"),
cum_cost_layer);
cum_fd = G_open_cell_old(cum_cost_layer, cum_cost_mapset);
@@ -865,8 +862,7 @@
cell2 = G_allocate_raster_buf(data_type2);
if (cell2 == NULL)
- G_fatal_error(_
- ("Memory allocation error on reading start points from raster map %s"),
+ G_fatal_error(_("Memory allocation error on reading start points from raster map %s"),
cum_cost_layer);
G_message(_("Reading %s... "), cum_cost_layer);
@@ -916,8 +912,7 @@
value_start_pt = &zero;
if (top_start_pt->row < 0 || top_start_pt->row >= nrows
|| top_start_pt->col < 0 || top_start_pt->col >= ncols)
- G_fatal_error(_
- ("Specified starting location outside database window"));
+ G_fatal_error(_("Specified starting location outside database window"));
new_cell = insert(zero, top_start_pt->row, top_start_pt->col);
segment_put(&out_seg, value_start_pt, top_start_pt->row,
top_start_pt->col);
@@ -1416,8 +1411,7 @@
G_percent(row, nrows, 2);
if (keep_nulls) {
if (G_get_raster_row(dtm_fd, cell2, row, dtm_data_type) < 0)
- G_fatal_error(_
- ("Unable to read raster map <%s> row %d"),
+ G_fatal_error(_("Unable to read raster map <%s> row %d"),
dtm_layer, row);
}
p = cum_cell;
@@ -1452,8 +1446,7 @@
G_percent(row, nrows, 2);
if (keep_nulls) {
if (G_get_raster_row(dtm_fd, cell2, row, dtm_data_type) < 0)
- G_fatal_error(_
- ("Unable to read raster map <%s> row %d"),
+ G_fatal_error(_("Unable to read raster map <%s> row %d"),
dtm_layer, row);
}
p = cum_cell;
Modified: grass/trunk/raster/r.water.outlet/main.c
===================================================================
--- grass/trunk/raster/r.water.outlet/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.water.outlet/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -100,8 +100,7 @@
if (E < window.west || E > window.east || N < window.south ||
N > window.north) {
- G_warning(_
- ("Warning, ignoring point outside window: \n %.4f,%.4f\n"),
+ G_warning(_("Warning, ignoring point outside window: \n %.4f,%.4f\n"),
E, N);
}
Modified: grass/trunk/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/init_vars.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.watershed/seg/init_vars.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -85,8 +85,7 @@
if (bas_thres > 0)
tot_parts++;
- G_message(_
- ("SECTION 1 beginning: Initiating Variables. %d sections total."),
+ G_message(_("SECTION 1 beginning: Initiating Variables. %d sections total."),
tot_parts);
this_mapset = G_mapset();
Modified: grass/trunk/raster/r.watershed/shed/basin_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/basin_maps.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.watershed/shed/basin_maps.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -9,12 +9,9 @@
char *mapset, map_layer[48];
int i;
- G_message(_
- ("\n\nPlease indicate which map layers you wish to use in the lumped"));
- G_message(_
- ("parameter hydrologic/soil erosion model. Continue inputing cell map"));
- G_message(_
- ("layers, one at a time, until all desired map layers are in."));
+ G_message(_("\n\nPlease indicate which map layers you wish to use in the lumped"));
+ G_message(_("parameter hydrologic/soil erosion model. Continue inputing cell map"));
+ G_message(_("layers, one at a time, until all desired map layers are in."));
G_message(_("You can have %s include a list of categories in each."),
G_program_name());
G_message(_("\nHit <return> at the map prompt to continue with %s"),
@@ -38,16 +35,13 @@
G_message(_("\nThe output from %s will be divided into watershed"),
G_program_name());
- G_message(_
- ("basins. There are two possible methods of tabulating the information:"));
- G_message(_
- ("1) by only including data pertaining to the basin itself, or 2) using"));
+ G_message(_("basins. There are two possible methods of tabulating the information:"));
+ G_message(_("1) by only including data pertaining to the basin itself, or 2) using"));
G_message(_("data from the basin, and all basins upstream of it."));
do {
G_message(_("\nWould you like the data organized:"));
- G_message(_
- ("1) Basin only\n2) Upstream only\n3) Both\nOR 0) to cancel program"));
+ G_message(_("1) Basin only\n2) Upstream only\n3) Both\nOR 0) to cancel program"));
fprintf(stderr, _("\nYour choice: "));
G_gets(map_layer);
sscanf(map_layer, "%d", &i);
Modified: grass/trunk/raster/r.watershed/shed/com_line.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/com_line.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.watershed/shed/com_line.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -18,28 +18,20 @@
input->haf_name = (char *)G_calloc(40, sizeof(char));
input->accum_name = (char *)G_calloc(40, sizeof(char));
- G_message(_
- ("\nThis set of questions will organize the command line for the"));
+ G_message(_("\nThis set of questions will organize the command line for the"));
G_message(_("%s program to run properly for your application."),
NON_NAME);
G_message(_("The first question is whether you want %s to run"),
NON_NAME);
G_message(_("in its fast mode or its slow mode. If you run %s"),
NON_NAME);
- G_message(_
- ("in the fast mode, the computer will finish about 10 times faster"));
- G_message(_
- ("than in the slow mode, but will not allow other programs to run"));
- G_message(_
- ("at the same time. The fast mode also places all of the data into"));
- G_message(_
- ("RAM, which limits the size of window that can be run. The slow"));
- G_message(_
- ("mode uses disk space in the same hard disk partition as where GRASS is"));
- G_message(_
- ("stored. Thus, if the program does not work in the slow mode, you will"));
- G_message(_
- ("need to remove unnecessary files from that partition. The slow mode"));
+ G_message(_("in the fast mode, the computer will finish about 10 times faster"));
+ G_message(_("than in the slow mode, but will not allow other programs to run"));
+ G_message(_("at the same time. The fast mode also places all of the data into"));
+ G_message(_("RAM, which limits the size of window that can be run. The slow"));
+ G_message(_("mode uses disk space in the same hard disk partition as where GRASS is"));
+ G_message(_("stored. Thus, if the program does not work in the slow mode, you will"));
+ G_message(_("need to remove unnecessary files from that partition. The slow mode"));
G_message(_("will allow other processes to run concurrently with %s.\n"),
NON_NAME);
@@ -72,8 +64,7 @@
"%s/etc/water/%s", G_getenv("GISBASE"), SEG_NAME);
}
- G_message(_
- ("\nIf you hit <return> by itself for the next question, this"));
+ G_message(_("\nIf you hit <return> by itself for the next question, this"));
G_message(_("program will terminate."));
mapset = G_ask_old("What is the name of the elevation map layer?",
@@ -87,17 +78,12 @@
G_message(_("\nOne of the options for %s is a `depression map'. A"),
prog_name);
- G_message(_
- ("depression map indicates all the locations in the current map window where"));
- G_message(_
- ("water accumulates and does not leave by the edge of the map. Lakes without"));
- G_message(_
- ("outlet streams and sinkholes are examples of `depressions'. If you wish to"));
- G_message(_
- ("have a depression map, prepare a map where non-zero values indicate the"));
+ G_message(_("depression map indicates all the locations in the current map window where"));
+ G_message(_("water accumulates and does not leave by the edge of the map. Lakes without"));
+ G_message(_("outlet streams and sinkholes are examples of `depressions'. If you wish to"));
+ G_message(_("have a depression map, prepare a map where non-zero values indicate the"));
G_message(_("locations where depressions occur.\n"));
- G_message(_
- ("Hit <return> by itself for the next question if there is no depression map."));
+ G_message(_("Hit <return> by itself for the next question if there is no depression map."));
mapset = G_ask_old("What is the name of the depression map layer?",
map_layer, "cell", "cell");
@@ -108,43 +94,28 @@
com_line_add(&(input->com_line_seg), " de=", map_layer, mapset);
}
- G_message(_
- ("\nThe %s program will divide the elevation map into a number of"),
+ G_message(_("\nThe %s program will divide the elevation map into a number of"),
prog_name);
- G_message(_
- ("watershed basins. The number of watershed basins is indirectly determined"));
- G_message(_
- ("by the `basin threshold' value. The basin threshold is the area necessary for"));
- G_message(_
- ("%s to define a unique watershed basin. This area only applies to"),
+ G_message(_("watershed basins. The number of watershed basins is indirectly determined"));
+ G_message(_("by the `basin threshold' value. The basin threshold is the area necessary for"));
+ G_message(_("%s to define a unique watershed basin. This area only applies to"),
prog_name);
- G_message(_
- ("`exterior drainage basins'. An exterior drainage basin does not have any"));
- G_message(_
- ("drainage basins flowing into it. Interior drainage basin size is determined"));
- G_message(_
- ("by the surface flow going into stream segments between stream interceptions."));
- G_message(_
- ("Thus interior drainage basins can be of any size. The %s program"),
+ G_message(_("`exterior drainage basins'. An exterior drainage basin does not have any"));
+ G_message(_("drainage basins flowing into it. Interior drainage basin size is determined"));
+ G_message(_("by the surface flow going into stream segments between stream interceptions."));
+ G_message(_("Thus interior drainage basins can be of any size. The %s program"),
prog_name);
- G_message(_
- ("also allows the user to relate basin size to potential overland flow"));
- G_message(_
- ("(i.e., areas with low infiltration capacities will need smaller areas to"));
- G_message(_
- ("develop stream channels than neighboring areas with high infiltration rates)."));
- G_message(_
- ("The user can create a map layer with potential overland flow values, and"));
+ G_message(_("also allows the user to relate basin size to potential overland flow"));
+ G_message(_("(i.e., areas with low infiltration capacities will need smaller areas to"));
+ G_message(_("develop stream channels than neighboring areas with high infiltration rates)."));
+ G_message(_("The user can create a map layer with potential overland flow values, and"));
G_message(_("%s will accumulate those values instead of area.\n"),
prog_name);
- G_message(_
- ("What unit of measure will you use for the basin threshold:"));
+ G_message(_("What unit of measure will you use for the basin threshold:"));
do {
- G_message(_
- (" 1) acres, 2) meters sq., 3) miles sq., 4) hectares,"));
- G_message(_
- (" 5) kilometers sq., 6) map cells, 7) overland flow units"));
+ G_message(_(" 1) acres, 2) meters sq., 3) miles sq., 4) hectares,"));
+ G_message(_(" 5) kilometers sq., 6) map cells, 7) overland flow units"));
fprintf(stderr, _("Choose 1-7 or 0 to exit this program: "));
G_gets(map_layer);
sscanf(map_layer, "%d", &i);
@@ -154,8 +125,7 @@
exit(EXIT_SUCCESS);
output->type_area = (char)i;
- G_message(_
- ("\nHow large an area (or how many overland flow units) must a drainage basin"));
+ G_message(_("\nHow large an area (or how many overland flow units) must a drainage basin"));
fprintf(stderr, _("be for it to be an exterior drainage basin: "));
G_gets(map_layer);
sscanf(map_layer, "%lf", &d);
@@ -206,8 +176,7 @@
(window->ns_res * window->ew_res), window);
break;
case 7: /* needs an overland flow map */
- G_message(_
- ("\nIf you hit <return> by itself for the next question, this"));
+ G_message(_("\nIf you hit <return> by itself for the next question, this"));
G_message(_("program will terminate."));
mapset = G_ask_old("What is the name of the overland flow map layer?",
map_layer, "cell", "cell");
@@ -319,13 +288,10 @@
prog_name);
G_message(_("%s to function (stream channels, overland flow aspect, and"),
G_program_name());
- G_message(_
- ("a display version of the accumulation map). %s also has the"),
+ G_message(_("a display version of the accumulation map). %s also has the"),
prog_name);
- G_message(_
- ("ability to generate several variables in the Revised Universal Soil Loss"));
- G_message(_
- ("Equation (Rusle): Slope Length (LS), and Slope Steepness (S).\n"));
+ G_message(_("ability to generate several variables in the Revised Universal Soil Loss"));
+ G_message(_("Equation (Rusle): Slope Length (LS), and Slope Steepness (S).\n"));
sprintf(buf, "Would you like any of these maps to be created?");
if (G_yes(buf, 1)) {
@@ -376,15 +342,11 @@
}
if (i) {
- G_message(_
- ("\nThe Slope Length factor (LS) and Slope Steepness (S) are influenced by"));
- G_message(_
- ("disturbed land. %s reflects this with an optional map layer or value"),
+ G_message(_("\nThe Slope Length factor (LS) and Slope Steepness (S) are influenced by"));
+ G_message(_("disturbed land. %s reflects this with an optional map layer or value"),
prog_name);
- G_message(_
- ("where the value indicates the percent of disturbed (barren) land in that cell."));
- G_message(_
- ("Type <return> if you do not have a disturbed land map layer."));
+ G_message(_("where the value indicates the percent of disturbed (barren) land in that cell."));
+ G_message(_("Type <return> if you do not have a disturbed land map layer."));
mapset = G_ask_old("", map_layer, "cell", "disturbed land");
if (mapset != NULL) {
@@ -396,8 +358,7 @@
NULL);
}
else {
- G_message(_
- ("\nType the value indicating the percent of disturbed land. This value will"));
+ G_message(_("\nType the value indicating the percent of disturbed land. This value will"));
G_message(_("be used for every cell in the current region."));
i = -6;
while (i < 0 || i > 100) {
@@ -412,18 +373,13 @@
}
/* 12345678901234567890123456789012345678901234567890123456789012345678901234567890 */
- G_message(_
- ("\nOverland surface flow only occurs for a set distance before swales form."));
- G_message(_
- ("Because of digital terrain model limitations, %s cannot pick up"),
+ G_message(_("\nOverland surface flow only occurs for a set distance before swales form."));
+ G_message(_("Because of digital terrain model limitations, %s cannot pick up"),
prog_name);
- G_message(_
- ("these swales. %s allows for an input (warning: kludge factor)"),
+ G_message(_("these swales. %s allows for an input (warning: kludge factor)"),
prog_name);
- G_message(_
- ("that prevents the surface flow distance from getting too long. Normally,"));
- G_message(_
- ("maximum slope length is around 600 feet (about 183 meters)."));
+ G_message(_("that prevents the surface flow distance from getting too long. Normally,"));
+ G_message(_("maximum slope length is around 600 feet (about 183 meters)."));
i = -1;
while (i < 0) {
@@ -438,13 +394,10 @@
com_add(&(input->com_line_seg), " ms=", i);
/* 12345678901234567890123456789012345678901234567890123456789012345678901234567890 */
- G_message(_
- ("\nRoads, ditches, changes in ground cover, and other factors will stop"));
- G_message(_
- ("slope length. You may input a raster map indicating the locations of these"));
+ G_message(_("\nRoads, ditches, changes in ground cover, and other factors will stop"));
+ G_message(_("slope length. You may input a raster map indicating the locations of these"));
G_message(_("blocking factors.\n"));
- G_message(_
- ("Hit <return> by itself for the next question if there is no blocking map."));
+ G_message(_("Hit <return> by itself for the next question if there is no blocking map."));
mapset = G_ask_old("What is the name of the blocking map layer?",
map_layer, "cell", "cell");
Modified: grass/trunk/raster/r.watershed/shed/intro.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/intro.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.watershed/shed/intro.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -7,18 +7,15 @@
{
G_message(_("%s provides a text-based user-interface to the %s program."),
G_program_name(), NON_NAME);
- G_message(_
- ("%s also allows the user to prepare a report of map layers for each"),
+ G_message(_("%s also allows the user to prepare a report of map layers for each"),
G_program_name());
G_message(_("watershed basin determined in %s.\n"), NON_NAME);
- G_message(_
- ("%s will help the user determine which options to use for the"),
+ G_message(_("%s will help the user determine which options to use for the"),
G_program_name());
G_message(_("%s program. %s will then ask for map layers that will be"),
NON_NAME, G_program_name());
- G_message(_
- ("divided by basin. %s will then run %s and create the report."),
+ G_message(_("divided by basin. %s will then run %s and create the report."),
G_program_name(), NON_NAME);
return (0);
Modified: grass/trunk/raster/r.watershed/shed/main.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/r.watershed/shed/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -37,8 +37,7 @@
if (input.fast) {
if (G_system(input.com_line_ram)) {
if (input.slow) {
- G_message(_
- ("Slow version of water analysis program starting now"));
+ G_message(_("Slow version of water analysis program starting now"));
if (G_system(input.com_line_seg)) {
free_input(&input);
Modified: grass/trunk/raster/simwe/r.sim.water/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.water/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/simwe/r.sim.water/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -490,8 +490,7 @@
if ((depth == NULL) && (disch == NULL) && (err == NULL) &&
(outwalk == NULL))
- G_warning(_
- ("You are not outputting any raster or vector points maps"));
+ G_warning(_("You are not outputting any raster or vector points maps"));
ret_val = input_data();
if (ret_val != 1)
G_fatal_error(_("Input failed"));
Modified: grass/trunk/raster/simwe/simlib/input.c
===================================================================
--- grass/trunk/raster/simwe/simlib/input.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/simwe/simlib/input.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -408,8 +408,7 @@
cchez[row_rev][j] = (float)manin_val;
}
else {
- G_fatal_error(_
- ("Raster map <%s> not found, and manin_val undefined, choose one to be allowed to process"),
+ G_fatal_error(_("Raster map <%s> not found, and manin_val undefined, choose one to be allowed to process"),
manin);
}
if (detin != NULL) {
@@ -592,8 +591,7 @@
}
}
if (inf != NULL && smax < infmax)
- G_warning(_
- ("Infiltration exceeds the rainfall rate everywhere! No overland flow."));
+ G_warning(_("Infiltration exceeds the rainfall rate everywhere! No overland flow."));
cc = (double)mx *my;
@@ -619,8 +617,7 @@
fprintf(stderr, "\n");
G_message(_("Min elevation \t= %.2f m\nMax elevation \t= %.2f m\n"), zmin,
zmax);
- G_message(_
- ("Mean Source Rate (rainf. excess or sediment) \t= %f m/s or kg/m2s \n"),
+ G_message(_("Mean Source Rate (rainf. excess or sediment) \t= %f m/s or kg/m2s \n"),
si0);
G_message(_("Mean flow velocity \t= %f m/s\n"), vmean);
G_message(_("Mean Mannings \t= %f\n"), 1.0 / chmean);
Modified: grass/trunk/raster/wildfire/r.ros/main.c
===================================================================
--- grass/trunk/raster/wildfire/r.ros/main.c 2008-08-06 22:00:00 UTC (rev 32585)
+++ grass/trunk/raster/wildfire/r.ros/main.c 2008-08-06 22:02:30 UTC (rev 32586)
@@ -422,26 +422,22 @@
/*check if the output layer names EXIST */
if (G_find_cell2(name_base, G_mapset()))
- G_fatal_error(_
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),
name_base, G_mapset());
if (G_find_cell2(name_max, G_mapset()))
- G_fatal_error(_
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),
name_max, G_mapset());
if (G_find_cell2(name_maxdir, G_mapset()))
- G_fatal_error(_
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),
name_maxdir, G_mapset());
/*assign a name to output SPOTTING distance layer */
if (spotting) {
sprintf(name_spotdist, "%s.spotdist", parm.output->answer);
if (G_find_cell2(name_spotdist, G_mapset()))
- G_fatal_error(_
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),
name_spotdist, G_mapset());
}
More information about the grass-commit
mailing list