[GRASS-SVN] r32587 - in grass/trunk/vector:
lidar/v.lidar.correction lidar/v.lidar.edgedetection
lidar/v.lidar.growing lidar/v.outlier lidar/v.surf.bspline
v.buffer v.build v.category v.class v.clean v.convert
v.db.connect v.digit v.distance v.drape v.edit v.generalize
v.hull v.in.ascii v.in.db v.in.dxf v.in.ogr v.in.sites v.info
v.kcv v.kernel v.label v.label.sa v.lrs/v.lrs.create
v.lrs/v.lrs.segment v.mapcalc v.net v.net.alloc v.net.iso
v.out.ascii v.out.ogr v.out.vtk v.overlay v.patch v.perturb
v.proj v.random v.reclass v.sample v.segment v.surf.idw
v.surf.rst v.to.db v.to.rast v.transform v.univar v.vol.rst
v.what.rast
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 6 18:06:13 EDT 2008
Author: neteler
Date: 2008-08-06 18:06:12 -0400 (Wed, 06 Aug 2008)
New Revision: 32587
Modified:
grass/trunk/vector/lidar/v.lidar.correction/correction.c
grass/trunk/vector/lidar/v.lidar.correction/main.c
grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c
grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
grass/trunk/vector/lidar/v.lidar.growing/main.c
grass/trunk/vector/lidar/v.outlier/main.c
grass/trunk/vector/lidar/v.outlier/outlier.c
grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c
grass/trunk/vector/lidar/v.surf.bspline/main.c
grass/trunk/vector/v.buffer/main.c
grass/trunk/vector/v.build/main.c
grass/trunk/vector/v.category/main.c
grass/trunk/vector/v.class/main.c
grass/trunk/vector/v.clean/main.c
grass/trunk/vector/v.clean/prune.c
grass/trunk/vector/v.convert/att.c
grass/trunk/vector/v.convert/old2new.c
grass/trunk/vector/v.db.connect/main.c
grass/trunk/vector/v.digit/main.c
grass/trunk/vector/v.distance/main.c
grass/trunk/vector/v.drape/main.c
grass/trunk/vector/v.edit/a2b.c
grass/trunk/vector/v.edit/main.c
grass/trunk/vector/v.generalize/main.c
grass/trunk/vector/v.hull/main.c
grass/trunk/vector/v.in.ascii/a2b.c
grass/trunk/vector/v.in.ascii/in.c
grass/trunk/vector/v.in.ascii/points.c
grass/trunk/vector/v.in.db/main.c
grass/trunk/vector/v.in.dxf/add_polyline.c
grass/trunk/vector/v.in.dxf/main.c
grass/trunk/vector/v.in.ogr/geom.c
grass/trunk/vector/v.in.ogr/main.c
grass/trunk/vector/v.in.sites/main.c
grass/trunk/vector/v.info/main.c
grass/trunk/vector/v.kcv/main.c
grass/trunk/vector/v.kernel/main.c
grass/trunk/vector/v.label.sa/font.c
grass/trunk/vector/v.label/main.c
grass/trunk/vector/v.lrs/v.lrs.create/main.c
grass/trunk/vector/v.lrs/v.lrs.segment/main.c
grass/trunk/vector/v.mapcalc/number.c
grass/trunk/vector/v.net.alloc/main.c
grass/trunk/vector/v.net.iso/main.c
grass/trunk/vector/v.net/main.c
grass/trunk/vector/v.net/report.c
grass/trunk/vector/v.out.ascii/out.c
grass/trunk/vector/v.out.ogr/main.c
grass/trunk/vector/v.out.vtk/main.c
grass/trunk/vector/v.out.vtk/writeVTK.c
grass/trunk/vector/v.overlay/main.c
grass/trunk/vector/v.patch/main.c
grass/trunk/vector/v.perturb/main.c
grass/trunk/vector/v.proj/main.c
grass/trunk/vector/v.random/main.c
grass/trunk/vector/v.reclass/main.c
grass/trunk/vector/v.sample/main.c
grass/trunk/vector/v.segment/main.c
grass/trunk/vector/v.surf.idw/main.c
grass/trunk/vector/v.surf.rst/main.c
grass/trunk/vector/v.to.db/main.c
grass/trunk/vector/v.to.db/parse.c
grass/trunk/vector/v.to.db/query.c
grass/trunk/vector/v.to.db/report.c
grass/trunk/vector/v.to.db/update.c
grass/trunk/vector/v.to.rast/do_lines.c
grass/trunk/vector/v.to.rast/main.c
grass/trunk/vector/v.to.rast/support.c
grass/trunk/vector/v.to.rast/vect2rast.c
grass/trunk/vector/v.transform/main.c
grass/trunk/vector/v.transform/trans_digit.c
grass/trunk/vector/v.univar/main.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/vector/v.vol.rst/user1.c
grass/trunk/vector/v.what.rast/main.c
Log:
fixed unlucky formatted messages (thanks to Glynn)
Modified: grass/trunk/vector/lidar/v.lidar.correction/correction.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/correction.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.lidar.correction/correction.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -81,13 +81,11 @@
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate_Correction
(interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*points->y < Overlap.S)) { /*(1) */
@@ -98,8 +96,7 @@
if (Insert_Correction
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
else { /*(1) */
@@ -108,8 +105,7 @@
if (Insert_Correction
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
}
else if ((*points->x < Overlap.W)) {
@@ -121,8 +117,7 @@
interpolation *= weight;
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
Vect_cat_get(cats, F_CLASSIFICATION, &class);
class =
@@ -144,13 +139,11 @@
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate_Correction
(interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else { /*(2) */
weight = (Overlap.W - *points->x) / overlap;
@@ -158,8 +151,7 @@
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
Vect_cat_get(cats, F_CLASSIFICATION, &class);
class =
@@ -182,8 +174,7 @@
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
Vect_cat_get(cats, F_CLASSIFICATION, &class);
class =
@@ -203,8 +194,7 @@
if (Insert_Correction
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
}
}
Modified: grass/trunk/vector/lidar/v.lidar.correction/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.lidar.correction/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -174,8 +174,7 @@
/* Start driver and open db */
driver = db_start_driver_open_database(dvr, db);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. Run db.connect."),
+ G_fatal_error(_("No database connection for driver <%s> is defined. Run db.connect."),
dvr);
/* Setting regions and boxes */
Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -237,14 +237,12 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate
(gradient[0], gradient[1], interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*point->y < Overlap.S) && (*point->y != General.S)) { /*(1) */
@@ -256,8 +254,7 @@
(gradient[0] * weight, gradient[1] * weight,
interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) { /*(1) */
@@ -267,8 +264,7 @@
(gradient[0] * weight, gradient[1] * weight,
interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
}
@@ -286,8 +282,7 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
edge =
@@ -318,14 +313,12 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate
(gradient[0], gradient[1], interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) { /*(2) */
@@ -338,8 +331,7 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
edge =
@@ -370,8 +362,7 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
edge =
@@ -396,8 +387,7 @@
(gradient[0] * weight, gradient[1] * weight,
interpolation * weight, line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
} /*else (1) */
} /*else */
Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -187,13 +187,11 @@
/* Start driver and open db */
driver = db_start_driver_open_database(dvr, db);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. Run db.connect."),
+ G_fatal_error(_("No database connection for driver <%s> is defined. Run db.connect."),
dvr);
if (Create_Interpolation_Table(out_opt->answer, driver) != DB_OK)
- G_fatal_error(_
- ("It was impossible to create <%s> interpolation table in database."),
+ G_fatal_error(_("It was impossible to create <%s> interpolation table in database."),
out_opt->answer);
/* Setting regions and boxes */
Modified: grass/trunk/vector/lidar/v.lidar.growing/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.lidar.growing/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -148,8 +148,7 @@
driver = db_start_driver_open_database(field->driver, field->database);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. Run db.connect."),
+ G_fatal_error(_("No database connection for driver <%s> is defined. Run db.connect."),
field->driver);
/* Setting regions and boxes */
Modified: grass/trunk/vector/lidar/v.outlier/main.c
===================================================================
--- grass/trunk/vector/lidar/v.outlier/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.outlier/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -164,8 +164,7 @@
Vect_set_open_level(1);
/* Open input vector */
if (1 > Vect_open_old(&In, in_opt->answer, mapset))
- G_fatal_error(_
- ("Unable to open vector map <%s> at the topological level"),
+ G_fatal_error(_("Unable to open vector map <%s> at the topological level"),
in_opt->answer);
/* Copy vector Head File */
@@ -186,8 +185,7 @@
/* Start driver and open db */
driver = db_start_driver_open_database(dvr, db);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. Run db.connect."),
+ G_fatal_error(_("No database connection for driver <%s> is defined. Run db.connect."),
dvr);
/* Setting regions and boxes */
@@ -317,8 +315,7 @@
"Creating auxiliar table for archiving overlaping zones");
if ((flag_auxiliar =
P_Create_Aux_Table(driver, table_name)) == FALSE)
- G_fatal_error(_
- ("It was impossible to create <Auxiliar_outlier_table>."));
+ G_fatal_error(_("It was impossible to create <Auxiliar_outlier_table>."));
}
if (qgis_opt->answer)
Modified: grass/trunk/vector/lidar/v.outlier/outlier.c
===================================================================
--- grass/trunk/vector/lidar/v.outlier/outlier.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.outlier/outlier.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -70,13 +70,11 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate_Outlier(gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*point->y < Overlap.S) && (*point->y != General.S)) { /*(1) */
@@ -87,8 +85,7 @@
if (Insert_Outlier
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) { /*(1) */
@@ -97,8 +94,7 @@
if (Insert_Outlier
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
}
@@ -115,8 +111,7 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
@@ -143,13 +138,11 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate_Outlier(gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) { /*(2) */
@@ -161,8 +154,7 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
@@ -189,8 +181,7 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
@@ -212,8 +203,7 @@
if (Insert_Outlier
(interpolation * weight, line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
} /*else (1) */
} /*else */
Modified: grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -117,8 +117,7 @@
Fi->database);
if (driver_cats == NULL)
- G_fatal_error(_
- ("CrossCorrelation: Cannot open database %s by driver %s"),
+ G_fatal_error(_("CrossCorrelation: Cannot open database %s by driver %s"),
Fi->database, Fi->driver);
nrec =
@@ -128,12 +127,10 @@
ctype = cvarr.ctype;
if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("CrossCorrelation: Column type not supported"));
+ G_fatal_error(_("CrossCorrelation: Column type not supported"));
if (nrec < 0)
- G_fatal_error(_
- ("CrossCorrelation: Cannot select data from table"));
+ G_fatal_error(_("CrossCorrelation: Cannot select data from table"));
G_message(_("CrossCorrelation: %d records selected from table"),
nrec);
@@ -216,8 +213,7 @@
obs_mean[i] = dval;
}
if (ret != DB_OK) {
- G_warning(_
- ("CrossCorrelation: No record for point (cat = %d)"),
+ G_warning(_("CrossCorrelation: No record for point (cat = %d)"),
cat);
continue;
}
@@ -333,8 +329,7 @@
G_free_vector(rms);
} /* ENDIF (ndata > 0) */
else
- G_warning(_
- ("CrossCorrelation: No point lies into the current region"));
+ G_warning(_("CrossCorrelation: No point lies into the current region"));
G_free(observ);
return TRUE;
Modified: grass/trunk/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/lidar/v.surf.bspline/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -201,8 +201,7 @@
driver = db_start_driver_open_database(dvr, db);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. "
+ G_fatal_error(_("No database connection for driver <%s> is defined. "
"Run db.connect."), dvr);
db_init_string(&sql);
@@ -229,8 +228,7 @@
Vect_set_open_level(1); /* WITHOUT TOPOLOGY */
if (1 > Vect_open_old(&In, in_opt->answer, mapset))
- G_fatal_error(_
- ("Unable to open vector map <%s> at the topological level"),
+ G_fatal_error(_("Unable to open vector map <%s> at the topological level"),
in_opt->answer);
/* Open input ext vector */
@@ -250,8 +248,7 @@
Vect_set_open_level(1); /* WITHOUT TOPOLOGY */
if (1 > Vect_open_old(&In_ext, in_ext_opt->answer, mapset))
- G_fatal_error(_
- ("Unable to open vector map <%s> at the topological level"),
+ G_fatal_error(_("Unable to open vector map <%s> at the topological level"),
in_opt->answer);
}
@@ -259,8 +256,7 @@
/* vector output */
if (vector && !map) {
if (strcmp(dvr, "dbf") == 0)
- G_fatal_error(_
- ("Sorry, <%s> driver is not allowed for vector output in this module. "
+ G_fatal_error(_("Sorry, <%s> driver is not allowed for vector output in this module. "
"Try with a raster output or other driver."), dvr);
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
@@ -382,8 +378,7 @@
nrows_ncols = (double)nrows *ncols;
if ((nrows_ncols) > 30000000) /* about 5500x5500 cells */
- G_fatal_error(_
- ("Interpolation: The region resolution is too high: %d cells. "
+ G_fatal_error(_("Interpolation: The region resolution is too high: %d cells. "
"Consider to change it."), nrows_ncols);
/*raster_matrix = G_alloc_fmatrix (nrows, ncols); Is it neccesary a double precision?? */
@@ -545,8 +540,7 @@
obs_mean[i] = dval;
}
if (ret != DB_OK) {
- G_warning(_
- ("Interpolation: (%d,%d): No record for point (cat = %d)"),
+ G_warning(_("Interpolation: (%d,%d): No record for point (cat = %d)"),
subregion_row, subregion_col, cat);
continue;
}
Modified: grass/trunk/vector/v.buffer/main.c
===================================================================
--- grass/trunk/vector/v.buffer/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.buffer/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -452,8 +452,7 @@
db_CatValArray_get_value_int(&cvarr, cat,
&size_val_int);
if (ret != DB_OK) {
- G_warning(_
- ("No record for category %d in table <%s>"),
+ G_warning(_("No record for category %d in table <%s>"),
cat, Fi->table);
continue;
}
@@ -465,16 +464,14 @@
db_CatValArray_get_value_double(&cvarr, cat,
&size_val);
if (ret != DB_OK) {
- G_warning(_
- ("No record for category %d in table <%s>"),
+ G_warning(_("No record for category %d in table <%s>"),
cat, Fi->table);
continue;
}
}
if (size_val < 0.0) {
- G_warning(_
- ("Attribute is of invalid size (%.3f) for category %d"),
+ G_warning(_("Attribute is of invalid size (%.3f) for category %d"),
size_val, cat);
continue;
}
@@ -493,8 +490,7 @@
G_debug(2, "Minimum tolerance = %f", dtmp);
if (tolerance > dtmp) {
tolerance = dtmp;
- G_warning(_
- ("The tolerance was reset to %g (map units). [category %d]"),
+ G_warning(_("The tolerance was reset to %g (map units). [category %d]"),
tolerance, cat);
}
}
@@ -533,8 +529,7 @@
db_CatValArray_get_value_int(&cvarr, cat,
&size_val_int);
if (ret != DB_OK) {
- G_warning(_
- ("No record for category %d in table <%s>"),
+ G_warning(_("No record for category %d in table <%s>"),
cat, Fi->table);
continue;
}
@@ -546,16 +541,14 @@
db_CatValArray_get_value_double(&cvarr, cat,
&size_val);
if (ret != DB_OK) {
- G_warning(_
- ("No record for category %d in table <%s>"),
+ G_warning(_("No record for category %d in table <%s>"),
cat, Fi->table);
continue;
}
}
if (size_val < 0.0) {
- G_warning(_
- ("Attribute is of invalid size (%.3f) for category %d"),
+ G_warning(_("Attribute is of invalid size (%.3f) for category %d"),
size_val, cat);
continue;
}
@@ -574,8 +567,7 @@
G_debug(2, "Minimum tolerance = %f", dtmp);
if (tolerance > dtmp) {
tolerance = dtmp;
- G_warning(_
- ("The tolerance was reset to %g (map units). [category %d]"),
+ G_warning(_("The tolerance was reset to %g (map units). [category %d]"),
tolerance, cat);
}
}
Modified: grass/trunk/vector/v.build/main.c
===================================================================
--- grass/trunk/vector/v.build/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.build/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -82,8 +82,7 @@
if (build) {
/* open input vector */
if (G_find_vector2(map_opt->answer, G_mapset()) == NULL)
- G_fatal_error(_
- ("Vector map <%s> not found in the current mapset"),
+ G_fatal_error(_("Vector map <%s> not found in the current mapset"),
map_opt->answer);
Vect_set_open_level(1);
Modified: grass/trunk/vector/v.category/main.c
===================================================================
--- grass/trunk/vector/v.category/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.category/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -130,8 +130,7 @@
break;
case ('c'):
option = O_CHFIELD;
- G_warning(_
- ("Database connection and attribute tables for concerned layers are not changed"));
+ G_warning(_("Database connection and attribute tables for concerned layers are not changed"));
break;
case ('s'):
option = O_SUM;
Modified: grass/trunk/vector/v.class/main.c
===================================================================
--- grass/trunk/vector/v.class/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.class/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -163,8 +163,7 @@
if (G_strcasecmp(algo_opt->answer, "dis") == 0 && finfo < 3.84148)
- G_warning(_
- ("The discontinuities algorithm indicates that some class breaks are not statistically significant at alpha=0.05. You are advised to reduce the number of classes."));
+ G_warning(_("The discontinuities algorithm indicates that some class breaks are not statistically significant at alpha=0.05. You are advised to reduce the number of classes."));
/*output to be piped to other modules ? */
if (shell_flag->answer) {
Modified: grass/trunk/vector/v.clean/main.c
===================================================================
--- grass/trunk/vector/v.clean/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.clean/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -368,8 +368,7 @@
G_message(_("%d modifications done"), count);
break;
case TOOL_RMLINE:
- G_message(_
- ("Tool: Remove all lines and boundaries of zero length"));
+ G_message(_("Tool: Remove all lines and boundaries of zero length"));
count = remove_zero_line(&Out, otype, pErr);
G_message(_("%d lines / boundaries removed"), count);
break;
@@ -379,8 +378,7 @@
}
if (!no_build_flag->answer) {
- G_important_message(_
- ("Rebuilding topology for output vector map..."));
+ G_important_message(_("Rebuilding topology for output vector map..."));
Vect_build_partial(&Out, GV_BUILD_NONE, NULL);
Vect_build(&Out, output);
}
Modified: grass/trunk/vector/v.clean/prune.c
===================================================================
--- grass/trunk/vector/v.clean/prune.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.clean/prune.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -217,13 +217,11 @@
fflush(stderr);
}
- G_important_message(_
- ("\n%d vertices from input %d (vertices of given type) removed, i.e. %.2f %%"),
+ G_important_message(_("\n%d vertices from input %d (vertices of given type) removed, i.e. %.2f %%"),
nremoved, nvertices, 100.0 * nremoved / nvertices);
if (not_pruned_lines > 0)
- G_message(_
- ("%d boundaries not pruned because pruning would damage topology"),
+ G_message(_("%d boundaries not pruned because pruning would damage topology"),
not_pruned_lines);
Vect_destroy_line_struct(Points);
Modified: grass/trunk/vector/v.convert/att.c
===================================================================
--- grass/trunk/vector/v.convert/att.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.convert/att.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -33,8 +33,7 @@
/* Find dig_cats if exists */
if (NULL == G_find_file("dig_cats", in, mapset)) {
- G_message(_
- ("No category labels (dig_cats) found, no table created.\n"));
+ G_message(_("No category labels (dig_cats) found, no table created.\n"));
return 0;
}
Modified: grass/trunk/vector/v.convert/old2new.c
===================================================================
--- grass/trunk/vector/v.convert/old2new.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.convert/old2new.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -86,14 +86,12 @@
}
}
if (sline == -1) {
- G_warning(_
- ("Failed to attach an attribute (category %d) to a line."),
+ G_warning(_("Failed to attach an attribute (category %d) to a line."),
cats[i].cat);
}
else {
if (lines[sline].cat > -1) {
- G_warning(_
- ("Line %d label: %d matched another label: %d."),
+ G_warning(_("Line %d label: %d matched another label: %d."),
sline, lines[sline].cat, cats[i].cat);
}
lines[sline].cat = cats[i].cat;
Modified: grass/trunk/vector/v.db.connect/main.c
===================================================================
--- grass/trunk/vector/v.db.connect/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.db.connect/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -132,16 +132,14 @@
Vect_open_old(&Map, inopt->answer, mapset);
else {
if (Vect_open_update_head(&Map, inopt->answer, G_mapset()) < 1)
- G_fatal_error(_
- ("Unable to modify vector map stored in other mapset"));
+ G_fatal_error(_("Unable to modify vector map stored in other mapset"));
Vect_hist_command(&Map);
}
if (print->answer || shell_print->answer || columns->answer) {
num_dblinks = Vect_get_num_dblinks(&Map);
if (num_dblinks <= 0)
- G_fatal_error(_
- ("Database connection for map <%s> is not defined in DB file"),
+ G_fatal_error(_("Database connection for map <%s> is not defined in DB file"),
G_fully_qualified_name(input, mapset));
else { /* num_dblinks > 0 */
@@ -178,8 +176,7 @@
else { /* columns */
if ((fi = Vect_get_field(&Map, field)) == NULL)
- G_fatal_error(_
- ("Database connection not defined for layer %d"),
+ G_fatal_error(_("Database connection not defined for layer %d"),
field);
driver = db_start_driver(fi->driver);
if (driver == NULL)
@@ -189,8 +186,7 @@
db_init_handle(&handle);
db_set_handle(&handle, fi->database, NULL);
if (db_open_database(driver, &handle) != DB_OK)
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi->database, fi->driver);
db_init_string(&table_name);
db_set_string(&table_name, fi->table);
@@ -241,8 +237,7 @@
if (db_table_exists
(dbdriver->answer, dbdatabase->answer,
dbtable->answer) < 1)
- G_fatal_error(_
- ("Table <%s> does not exist in database <%s>"),
+ G_fatal_error(_("Table <%s> does not exist in database <%s>"),
dbtable->answer,
dbdatabase->answer);
@@ -257,23 +252,20 @@
db_get_column(driver, dbtable->answer, dbkey->answer,
&column);
if (!column)
- G_fatal_error(_
- ("Missing column <%s> in table <%s>"),
+ G_fatal_error(_("Missing column <%s> in table <%s>"),
dbkey->answer, dbtable->answer);
if (db_column_Ctype
(driver, dbtable->answer,
dbkey->answer) != DB_C_TYPE_INT)
- G_fatal_error(_
- ("Data type of key column must be integer"));
+ G_fatal_error(_("Data type of key column must be integer"));
ret = Vect_map_del_dblink(&Map, field);
if (Vect_map_add_dblink(&Map, field,
fi->name, fi->table, fi->key,
fi->database,
fi->driver) == 0) {
- G_important_message(_
- ("The table <%s> is now part of vector map <%s> "
+ G_important_message(_("The table <%s> is now part of vector map <%s> "
"and may be deleted "
"or overwritten by GRASS modules"),
dbtable->answer, input);
@@ -285,15 +277,13 @@
if (db_table_exists
(dbdriver->answer, dbdatabase->answer,
dbtable->answer) < 1)
- G_warning(_
- ("Table <%s> does not exist in database <%s>"),
+ G_warning(_("Table <%s> does not exist in database <%s>"),
dbtable->answer, dbdatabase->answer);
if (Vect_map_add_dblink(&Map, field,
fi->name, fi->table, fi->key,
fi->database, fi->driver) == 0) {
- G_important_message(_
- ("The table <%s> is now part of vector map <%s> "
+ G_important_message(_("The table <%s> is now part of vector map <%s> "
"and may be deleted "
"or overwritten by GRASS modules"),
dbtable->answer, input);
@@ -304,8 +294,7 @@
&Map));
if (!driver)
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi->database, fi->driver);
if (db_create_index2(driver, fi->table, fi->key) !=
@@ -315,12 +304,10 @@
if (db_grant_on_table
(driver, fi->table, DB_PRIV_SELECT,
DB_GROUP | DB_PUBLIC) != DB_OK)
- G_warning(_
- ("Cannot grant privileges on table %s"),
+ G_warning(_("Cannot grant privileges on table %s"),
fi->table);
- G_important_message(_
- ("Select privileges were granted on the table"));
+ G_important_message(_("Select privileges were granted on the table"));
db_close_database_shutdown_driver(driver);
}
Modified: grass/trunk/vector/v.digit/main.c
===================================================================
--- grass/trunk/vector/v.digit/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.digit/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -155,8 +155,7 @@
Vect_open_update(&Map, map_opt->answer, G_mapset());
}
else {
- G_fatal_error(_
- ("Map <%s> does not exist in current mapset. Add flag -n to create a new map."),
+ G_fatal_error(_("Map <%s> does not exist in current mapset. Add flag -n to create a new map."),
map_opt->answer);
}
}
Modified: grass/trunk/vector/v.distance/main.c
===================================================================
--- grass/trunk/vector/v.distance/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.distance/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -294,8 +294,7 @@
G_fatal_error(_("Vector map <%s> not found"), from_opt->answer);
if (!print_flag->answer && strcmp(mapset, G_mapset()) != 0)
- G_fatal_error(_
- ("Vector map <%s> is not in user mapset and cannot be updated"),
+ G_fatal_error(_("Vector map <%s> is not in user mapset and cannot be updated"),
from_opt->answer);
Vect_set_open_level(2);
@@ -348,14 +347,12 @@
if (!all) {
Fi = Vect_get_field(&From, from_field);
if (Fi == NULL)
- G_fatal_error(_
- ("Database connection not defined for layer %d"),
+ G_fatal_error(_("Database connection not defined for layer %d"),
from_field);
driver = db_start_driver_open_database(Fi->driver, Fi->database);
if (driver == NULL)
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Fi->database, Fi->driver);
/* check if column exists */
@@ -709,8 +706,7 @@
for (j = 0; j < TCats->n_cats; j++) {
if (TCats->field[j] == to_field) {
if (tmp_tcat >= 0)
- G_warning(_
- ("More cats found in to_layer (area=%d)"),
+ G_warning(_("More cats found in to_layer (area=%d)"),
area);
tmp_tcat = TCats->cat[j];
}
@@ -851,8 +847,7 @@
G_debug(3, "selected values = %d", nrec);
if (cvarr.ctype == DB_C_TYPE_DATETIME) {
- G_warning(_
- ("DATETIME type not yet supported, no attributes will be uploaded"));
+ G_warning(_("DATETIME type not yet supported, no attributes will be uploaded"));
}
db_close_database_shutdown_driver(to_driver);
}
@@ -1119,8 +1114,7 @@
G_message(_("%d categories exist in the table"), ncatexist);
G_message(_("%d categories read from the map exist in the table"),
update_exist);
- G_message(_
- ("%d categories read from the map don't exist in the table"),
+ G_message(_("%d categories read from the map don't exist in the table"),
update_notexist);
G_message(_("%d records updated"), update_ok);
G_message(_("%d update errors"), update_err);
Modified: grass/trunk/vector/v.drape/main.c
===================================================================
--- grass/trunk/vector/v.drape/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.drape/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -153,15 +153,13 @@
if (in_bbox.W < region_bbox.W ||
in_bbox.E > region_bbox.E ||
in_bbox.S < region_bbox.S || in_bbox.N > region_bbox.N) {
- G_warning(_
- ("Current region does not include the entire input vector map <%s>"),
+ G_warning(_("Current region does not include the entire input vector map <%s>"),
in_opt->answer);
}
if (in_bbox.W < rast_bbox.W ||
in_bbox.E > rast_bbox.E ||
in_bbox.S < rast_bbox.S || in_bbox.N > rast_bbox.N) {
- G_warning(_
- ("Elevation raster map <%s> does not cover the entire area "
+ G_warning(_("Elevation raster map <%s> does not cover the entire area "
"of the input vector map <%s>. "), rast_opt->answer,
in_opt->answer);
}
Modified: grass/trunk/vector/v.edit/a2b.c
===================================================================
--- grass/trunk/vector/v.edit/a2b.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.edit/a2b.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -133,8 +133,7 @@
/* Collect the points */
for (i = 0; i < n_coors; i++) {
if (G_getl2(buff, BUFFSIZE - 1, ascii) == 0) {
- G_warning(_
- ("End of ASCII file reached before end of coordinates"));
+ G_warning(_("End of ASCII file reached before end of coordinates"));
return -1;
}
if (buff[0] == '\0') {
@@ -176,8 +175,7 @@
/* Collect the cats */
for (i = 0; i < n_cats; i++) {
if (G_getl2(buff, BUFFSIZE - 1, ascii) == 0) {
- G_warning(_
- ("End of ascii file reached before end of categories"));
+ G_warning(_("End of ascii file reached before end of categories"));
return -1;
}
if (buff[0] == '\0') {
Modified: grass/trunk/vector/v.edit/main.c
===================================================================
--- grass/trunk/vector/v.edit/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.edit/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -111,8 +111,7 @@
else { /* open selected vector file */
mapset = G_find_vector2(params.map->answer, G_mapset());
if (mapset == NULL) {
- G_fatal_error(_
- ("Vector map <%s> not found in the current mapset"),
+ G_fatal_error(_("Vector map <%s> not found in the current mapset"),
params.map->answer);
}
else if (action_mode == MODE_ADD) { /* write */
@@ -123,8 +122,7 @@
}
if (ret < 2)
- G_fatal_error(_
- ("Unable to open vector map <%s> at topological level %d"),
+ G_fatal_error(_("Unable to open vector map <%s> at topological level %d"),
params.map->answer, 2);
}
@@ -147,8 +145,7 @@
((const char *)params.map->answer, (const char *)G_mapset()),
G_fully_qualified_name((const char *)bmap,
(const char *)mapset)) == 0) {
- G_fatal_error(_
- ("Unable to open vector map <%s> as the backround map. "
+ G_fatal_error(_("Unable to open vector map <%s> as the backround map. "
"It is given as vector map to be edited."),
bmap);
}
@@ -222,8 +219,7 @@
/* reopen the map for updating */
if (action_mode == MODE_ZBULK && !Vect_is_3d(&Map)) {
Vect_close(&Map);
- G_fatal_error(_
- ("Vector map <%s> is not 3D. Tool '%s' requires 3D vector map. "
+ G_fatal_error(_("Vector map <%s> is not 3D. Tool '%s' requires 3D vector map. "
"Please convert the vector map "
"to 3D using e.g. %s."), params.map->answer,
params.tool->answer, "v.extrude");
Modified: grass/trunk/vector/v.generalize/main.c
===================================================================
--- grass/trunk/vector/v.generalize/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.generalize/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -321,8 +321,7 @@
if (layer < 1)
G_fatal_error(_("'%s' must be > 0 for '%s'"), "layer", "where");
if (cat_opt->answer)
- G_warning(_
- ("'where' and 'cats' parameters were supplied, cat will be ignored"));
+ G_warning(_("'where' and 'cats' parameters were supplied, cat will be ignored"));
chcat = 1;
varray = Vect_new_varray(Vect_get_num_lines(&In));
if (Vect_set_varray_from_db
Modified: grass/trunk/vector/v.hull/main.c
===================================================================
--- grass/trunk/vector/v.hull/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.hull/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -329,8 +329,7 @@
G_fatal_error(_("Error loading vector points map <%s>"), sitefile);
if (numSitePoints < 3)
- G_fatal_error(_
- ("Convex hull calculation requires at least three points"));
+ G_fatal_error(_("Convex hull calculation requires at least three points"));
/* create a 2D or a 3D hull? */
Modified: grass/trunk/vector/v.in.ascii/a2b.c
===================================================================
--- grass/trunk/vector/v.in.ascii/a2b.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.ascii/a2b.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -99,8 +99,7 @@
/* Collect the points */
for (i = 0; i < n_coors; i++) {
if (G_getl2(buff, BUFFSIZE - 1, ascii) == 0)
- G_fatal_error(_
- ("End of ASCII file reached before end of coordinates"));
+ G_fatal_error(_("End of ASCII file reached before end of coordinates"));
if (buff[0] == '\0') {
G_debug(3, "a2b: skipping blank line while reading vertices");
@@ -141,8 +140,7 @@
/* Collect the cats */
for (i = 0; i < n_cats; i++) {
if (G_getl2(buff, BUFFSIZE - 1, ascii) == 0)
- G_fatal_error(_
- ("End of ASCII file reached before end of categories"));
+ G_fatal_error(_("End of ASCII file reached before end of categories"));
if (buff[0] == '\0') {
G_debug(3,
Modified: grass/trunk/vector/v.in.ascii/in.c
===================================================================
--- grass/trunk/vector/v.in.ascii/in.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.ascii/in.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -259,13 +259,11 @@
/* check column numbers */
if (xcol >= minncols) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("x column number > minimum last column number\n(incorrect field separator?)"));
+ G_fatal_error(_("x column number > minimum last column number\n(incorrect field separator?)"));
}
if (ycol >= minncols) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("y column number > minimum last column number\n(incorrect field separator?)"));
+ G_fatal_error(_("y column number > minimum last column number\n(incorrect field separator?)"));
}
if (zcol >= minncols) {
Vect_delete(new->answer);
@@ -315,8 +313,7 @@
&Map));
if (driver == NULL) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Vect_subst_var(Fi->database, &Map), Fi->driver);
}
db_begin_transaction(driver);
@@ -335,8 +332,7 @@
}
if (catcol == i && coltype[i] != DB_C_TYPE_INT) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Category column is not of integer type"));
+ G_fatal_error(_("Category column is not of integer type"));
}
switch (coltype[i]) {
@@ -417,8 +413,7 @@
if ((catcol >= 0 && nc != ncols) ||
(catcol < 0 && (nc - 1) != ncols)) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Number of columns defined (%d) does not match number "
+ G_fatal_error(_("Number of columns defined (%d) does not match number "
"of columns (%d) in input"),
catcol < 0 ? nc - 1 : nc, ncols);
}
@@ -446,14 +441,12 @@
switch (coltype[i]) {
case DB_C_TYPE_INT:
if (ctype == DB_C_TYPE_DOUBLE) {
- G_warning(_
- ("Column number %d <%s> defined as double "
+ G_warning(_("Column number %d <%s> defined as double "
"has only integer values"), i + 1,
db_get_column_name(column));
}
else if (ctype == DB_C_TYPE_STRING) {
- G_warning(_
- ("Column number %d <%s> defined as string "
+ G_warning(_("Column number %d <%s> defined as string "
"has only integer values"), i + 1,
db_get_column_name(column));
}
@@ -461,14 +454,12 @@
case DB_C_TYPE_DOUBLE:
if (ctype == DB_C_TYPE_INT) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Column number %d <%s> defined as integer "
+ G_fatal_error(_("Column number %d <%s> defined as integer "
"has double values"), i + 1,
db_get_column_name(column));
}
else if (ctype == DB_C_TYPE_STRING) {
- G_warning(_
- ("Column number %d <%s> defined as string "
+ G_warning(_("Column number %d <%s> defined as string "
"has double values"), i + 1,
db_get_column_name(column));
}
@@ -476,22 +467,19 @@
case DB_C_TYPE_STRING:
if (ctype == DB_C_TYPE_INT) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Column number %d <%s> defined as integer "
+ G_fatal_error(_("Column number %d <%s> defined as integer "
"has string values"), i + 1,
db_get_column_name(column));
}
else if (ctype == DB_C_TYPE_DOUBLE) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Column number %d <%s> defined as double "
+ G_fatal_error(_("Column number %d <%s> defined as double "
"has string values"), i + 1,
db_get_column_name(column));
}
if (length < collen[i]) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Length of column %d <%s> (%d) is less than "
+ G_fatal_error(_("Length of column %d <%s> (%d) is less than "
"maximum value " "length (%d)"),
i + 1, db_get_column_name(column),
length, collen[i]);
@@ -513,8 +501,7 @@
}
if (db_create_index2(driver, Fi->table, key) != DB_OK)
- G_warning(_
- ("Unable to create index for table <%s>, key <%s>"),
+ G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fi->table, key);
Vect_map_del_dblink(&Map, 1);
Modified: grass/trunk/vector/v.in.ascii/points.c
===================================================================
--- grass/trunk/vector/v.in.ascii/points.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.ascii/points.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -162,8 +162,7 @@
}
else {
fprintf(stderr, "Current row: '%s'\n", buf_raw);
- G_fatal_error(_
- ("Unparsable longitude value in column <%d>: %s"),
+ G_fatal_error(_("Unparsable longitude value in column <%d>: %s"),
i, tokens[i]);
}
}
@@ -182,8 +181,7 @@
}
else {
fprintf(stderr, "Current row: '%s'\n", buf_raw);
- G_fatal_error(_
- ("Unparsable latitude value in column <%d>: %s"),
+ G_fatal_error(_("Unparsable latitude value in column <%d>: %s"),
i, tokens[i]);
}
}
@@ -260,8 +258,7 @@
G_free(tmp_token);
if (region_flag)
- G_message(_
- ("Skipping %d of %d rows falling outside of current region"),
+ G_message(_("Skipping %d of %d rows falling outside of current region"),
skipped, row - 1);
return 0;
Modified: grass/trunk/vector/v.in.db/main.c
===================================================================
--- grass/trunk/vector/v.in.db/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.db/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -127,8 +127,7 @@
if (db_table_exists(db_get_default_driver_name(),
db_get_default_database_name(), outvect->answer) == 1)
- G_fatal_error(_
- ("Output vector map, table <%s> (driver: <%s>, database: <%s>) "
+ G_fatal_error(_("Output vector map, table <%s> (driver: <%s>, database: <%s>) "
"already exists"), outvect->answer,
db_get_default_driver_name(),
db_get_default_database_name());
Modified: grass/trunk/vector/v.in.dxf/add_polyline.c
===================================================================
--- grass/trunk/vector/v.in.dxf/add_polyline.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.dxf/add_polyline.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -75,8 +75,7 @@
|| polyline_flag & 32)
if (warn_flag70) {
if (!flag_list)
- G_warning(_
- ("3-d data in dxf file. Polyline_flag: %d"),
+ G_warning(_("3-d data in dxf file. Polyline_flag: %d"),
polyline_flag);
warn_flag70 = 0;
}
Modified: grass/trunk/vector/v.in.dxf/main.c
===================================================================
--- grass/trunk/vector/v.in.dxf/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.dxf/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -121,8 +121,7 @@
num_layers = 0;
layers = NULL;
Map = NULL;
- G_verbose_message(_
- ("Layer number: layer name / GRASS compliant name"));
+ G_verbose_message(_("Layer number: layer name / GRASS compliant name"));
}
else {
/* make vector map name SQL compliant */
Modified: grass/trunk/vector/v.in.ogr/geom.c
===================================================================
--- grass/trunk/vector/v.in.ogr/geom.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.ogr/geom.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -317,8 +317,7 @@
Vect_write_line(Map, otype, Points, Cats);
}
else { /* 0 points */
- G_warning(_
- ("No centroid written for polygon with 0 vertices"));
+ G_warning(_("No centroid written for polygon with 0 vertices"));
}
}
Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.ogr/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -332,8 +332,7 @@
if (!outloc_opt->answer) { /* Check if the map exists */
if (G_find_vector2(out_opt->answer, G_mapset())) {
if (overwrite)
- G_warning(_
- ("Vector map <%s> already exists and will be overwritten"),
+ G_warning(_("Vector map <%s> already exists and will be overwritten"),
out_opt->answer);
else
G_fatal_error(_("Vector map <%s> already exists"),
@@ -377,8 +376,7 @@
if (region_flag->answer) {
if (spat_opt->answer)
- G_fatal_error(_
- ("Select either the current region flag or the spatial option, not both"));
+ G_fatal_error(_("Select either the current region flag or the spatial option, not both"));
G_get_window(&cur_wind);
xmin = cur_wind.west;
@@ -485,8 +483,7 @@
/* Projection only required for checking so convert non-interactively */
if (GPJ_osr_to_grass(&cellhd, &proj_info,
&proj_units, Ogr_projection, 0) < 0)
- G_warning(_
- ("Unable to convert input map projection information to "
+ G_warning(_("Unable to convert input map projection information to "
"GRASS format for checking"));
/* Does the projection of the current location match the dataset? */
@@ -709,8 +706,7 @@
/* hack: treat as string */
sprintf(buf, ", %s varchar ( %d )", Ogr_fieldname,
OFTIntegerListlength);
- G_warning(_
- ("Writing column <%s> with fixed length %d chars (may be truncated)"),
+ G_warning(_("Writing column <%s> with fixed length %d chars (may be truncated)"),
Ogr_fieldname, OFTIntegerListlength);
}
else if (Ogr_ftype == OFTReal) {
@@ -733,8 +729,7 @@
fwidth = OGR_Fld_GetWidth(Ogr_field);
/* TODO: read all records first and find the longest string length */
if (fwidth == 0) {
- G_warning(_
- ("Width for column %s set to 255 (was not specified by OGR), "
+ G_warning(_("Width for column %s set to 255 (was not specified by OGR), "
"some strings may be truncated!"),
Ogr_fieldname);
fwidth = 255;
@@ -746,8 +741,7 @@
/* hack: treat as string */
sprintf(buf, ", %s varchar ( %d )", Ogr_fieldname,
OFTIntegerListlength);
- G_warning(_
- ("Writing column %s with fixed length %d chars (may be truncated)"),
+ G_warning(_("Writing column %s with fixed length %d chars (may be truncated)"),
Ogr_fieldname, OFTIntegerListlength);
}
else {
@@ -1077,8 +1071,7 @@
G_message("%s", separator);
if (n_overlaps > 0) {
- G_warning(_
- ("%d areas represent more (overlapping) features, because polygons overlap "
+ G_warning(_("%d areas represent more (overlapping) features, because polygons overlap "
"in input layer(s). Such areas are linked to more than 1 row in attribute table. "
"The number of features for those areas is stored as category in layer %d"),
n_overlaps, nlayers + 1);
@@ -1133,8 +1126,7 @@
}
if (with_z && !z_flag->answer)
- G_warning(_
- ("Input data contains 3D features. Created vector is 2D only, "
+ G_warning(_("Input data contains 3D features. Created vector is 2D only, "
"use -z flag to import 3D vector"));
exit(EXIT_SUCCESS);
Modified: grass/trunk/vector/v.in.sites/main.c
===================================================================
--- grass/trunk/vector/v.in.sites/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.in.sites/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -95,12 +95,10 @@
dims, strs, dbls);
if (map_type == FCELL_TYPE || map_type == DCELL_TYPE) {
- G_message(_
- ("Floating point category values, using sequential integer for category"));
+ G_message(_("Floating point category values, using sequential integer for category"));
}
else if (map_type != CELL_TYPE) {
- G_message(_
- ("No category values, using sequential integer for category"));
+ G_message(_("No category values, using sequential integer for category"));
}
clen = (int *)G_calloc(strs, sizeof(int));
Modified: grass/trunk/vector/v.info/main.c
===================================================================
--- grass/trunk/vector/v.info/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.info/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -185,15 +185,13 @@
if (columns->answer) {
num_dblinks = Vect_get_num_dblinks(&Map);
if (num_dblinks <= 0) {
- G_fatal_error(_
- ("Database connection for map <%s> is not defined in DB file"),
+ G_fatal_error(_("Database connection for map <%s> is not defined in DB file"),
in_opt->answer);
}
else { /* num_dblinks > 0 */
field = atoi(fieldopt->answer);
- G_message(_
- ("Displaying column types/names for database connection of layer %d:"),
+ G_message(_("Displaying column types/names for database connection of layer %d:"),
field);
if ((fi = Vect_get_field(&Map, field)) == NULL)
G_fatal_error("Database connection not defined");
Modified: grass/trunk/vector/v.kcv/main.c
===================================================================
--- grass/trunk/vector/v.kcv/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.kcv/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -134,8 +134,7 @@
Vect_set_open_level(2);
if (Vect_open_old(&In, in_opt->answer, mapset) < 2) {
- G_fatal_error(_
- ("Unable to open vector map <%s> at topological level %d"),
+ G_fatal_error(_("Unable to open vector map <%s> at topological level %d"),
in_opt->answer, 2);
}
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.kernel/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -69,8 +69,7 @@
/* resL = (1./(pow(n,2.)*pow(smooth,dimension))) * (resL + n*( gaussianFunction(0.,2.,dimension) - 2. * gaussianKernel(0.,term)) ) + (2./(n*pow(smooth,dimension)))*gaussianKernel(0.,term); */
G_debug(3, "smooth = %e resL = %e", smooth, resL);
- G_message(_
- ("\tScore Value=%f\tsmoothing parameter (standard deviation)=%f"),
+ G_message(_("\tScore Value=%f\tsmoothing parameter (standard deviation)=%f"),
resL, smooth);
return (resL);
@@ -273,8 +272,7 @@
/* valutazione distanza ottimale */
if (flag_o->answer) {
/* Note: sigmaOptimal calculates using ALL points (also those outside the region) */
- G_message(_
- ("Automatic choose of smoothing parameter (standard deviation), maximum possible "
+ G_message(_("Automatic choose of smoothing parameter (standard deviation), maximum possible "
"value of standard deviation is was set to %f"), sigma);
/* maximum distance 4*sigma (3.9*sigma ~ 1.0000), keep it small, otherwise it takes
Modified: grass/trunk/vector/v.label/main.c
===================================================================
--- grass/trunk/vector/v.label/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.label/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -249,8 +249,7 @@
if (Along_flag->answer && !fontsize &&
(size / space >= 2 || size / space <= 0.5))
- G_warning(_
- ("size and space options vary significantly which may lead to crummy output"));
+ G_warning(_("size and space options vary significantly which may lead to crummy output"));
/* parse reference answers */
Modified: grass/trunk/vector/v.label.sa/font.c
===================================================================
--- grass/trunk/vector/v.label.sa/font.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.label.sa/font.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -51,8 +51,7 @@
fp = NULL;
if ((capfile = getenv("GRASS_FONT_CAP"))) {
if ((fp = fopen(capfile, "r")) == NULL)
- G_warning(_
- ("%s: Unable to read font definition file; use the default"),
+ G_warning(_("%s: Unable to read font definition file; use the default"),
capfile);
}
if (fp == NULL) {
Modified: grass/trunk/vector/v.lrs/v.lrs.create/main.c
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.create/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.lrs/v.lrs.create/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -474,8 +474,7 @@
if (floor(mp_tmp) != mp_tmp) {
mp_tmp2 = floor(mp_tmp);
off_tmp2 = off_tmp + multip * (mp_tmp - mp_tmp2);
- G_warning(_
- ("Milepost (start) %f+%f used as %f+%f (change MP to integer)"),
+ G_warning(_("Milepost (start) %f+%f used as %f+%f (change MP to integer)"),
mp_tmp, off_tmp, mp_tmp2, off_tmp2);
}
else {
@@ -497,8 +496,7 @@
if (floor(mp_tmp) != mp_tmp) {
mp_tmp2 = floor(mp_tmp);
off_tmp2 = off_tmp + multip * (mp_tmp - mp_tmp2);
- G_warning(_
- ("Milepost (end) %f+%f used as %f+%f (change MP to integer)"),
+ G_warning(_("Milepost (end) %f+%f used as %f+%f (change MP to integer)"),
mp_tmp, off_tmp, mp_tmp2, off_tmp2);
}
else {
@@ -571,8 +569,7 @@
else {
mposts[mpost].line_idx = PORT_INT_MAX;
mposts[mpost].err = ERR_THRESHOLD;
- G_warning(_
- ("Point [%d] cat [%d] is out of threshold (distance = %f)"),
+ G_warning(_("Point [%d] cat [%d] is out of threshold (distance = %f)"),
point, cat, distance_to);
}
}
@@ -721,8 +718,7 @@
mposts[k + 1].end_mp,
mposts[k + 1].end_off);
if (ret > -1) { /* start >= end */
- G_warning(_
- ("Start of 1. MP >= end of 2. MP for points' "
+ G_warning(_("Start of 1. MP >= end of 2. MP for points' "
"cats %[d], [%d]"), mposts[k].cat,
mposts[k + 1].cat);
mposts[k].err = ERR_END_GT_START;
@@ -739,8 +735,7 @@
mposts[k + 1].start_mp,
mposts[k + 1].start_off);
if (ret > -1) { /* start > end */
- G_warning(_
- ("Start of 1. MP >= start of 2. MP for points' "
+ G_warning(_("Start of 1. MP >= start of 2. MP for points' "
"cats [%d], [%d]"), mposts[k].cat,
mposts[k + 1].cat);
mposts[k].err = ERR_END_GT_START;
@@ -750,8 +745,7 @@
}
/* 4) For 2 MPs must be distance along line different (duplicate points) */
if (mposts[k].dist_along == mposts[k + 1].dist_along) {
- G_warning(_
- ("Distance along line identical for points' "
+ G_warning(_("Distance along line identical for points' "
"cats [%d], [%d]"), mposts[k].cat,
mposts[k + 1].cat);
mposts[k].err = ERR_IDENT;
@@ -765,19 +759,16 @@
/* Write errors if any ( and continue ) */
if (!order) { /* something is wrong */
if (rlines[j].nmposts < 2) { /* Impossible to get reference/direction */
- G_warning(_
- ("Not enough points (%d) attached to the line (cat %d), "
+ G_warning(_("Not enough points (%d) attached to the line (cat %d), "
"line skip."), rlines[j].nmposts,
rlines[j].cat);
}
else if (rlines[j].direction == DIR_UNKNOWN) { /* Unknown direction */
- G_warning(_
- ("Unable to guess direction for the line (cat %d), "
+ G_warning(_("Unable to guess direction for the line (cat %d), "
"line skip."), rlines[j].cat);
}
else {
- G_warning(_
- ("Incorrect order of points along line cat [%d]"),
+ G_warning(_("Incorrect order of points along line cat [%d]"),
rlines[j].cat);
rlines[j].err = ERR_LINE_ORDER;
}
Modified: grass/trunk/vector/v.lrs/v.lrs.segment/main.c
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.segment/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.lrs/v.lrs.segment/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -279,8 +279,7 @@
}
/* Check if both points are at the same line */
if (lcat1 != lcat2) {
- G_warning(_
- ("Segment over 2 (or more) segments, not yet supported"));
+ G_warning(_("Segment over 2 (or more) segments, not yet supported"));
break;
}
G_debug(2, "segment: lcat = %d : %f - %f", lcat1, map_offset1,
Modified: grass/trunk/vector/v.mapcalc/number.c
===================================================================
--- grass/trunk/vector/v.mapcalc/number.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.mapcalc/number.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -210,8 +210,7 @@
func = getsym(buf);
if (!func) {
if (opd1->itype == st_num)
- G_warning(_
- ("No function defined to perform ``number %c number''"),
+ G_warning(_("No function defined to perform ``number %c number''"),
op);
else if (opd1->itype == st_pnt)
G_warning(_("No function defined to perform ``point %c point''"),
Modified: grass/trunk/vector/v.net/main.c
===================================================================
--- grass/trunk/vector/v.net/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.net/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -170,8 +170,7 @@
Vect_set_fatal_error(GV_FATAL_PRINT);
if (1 > Vect_open_new(&Out, output->answer, is3d)) {
Vect_close(&In);
- G_fatal_error(_
- ("Unable to open vector map <%s> at topology level %d"),
+ G_fatal_error(_("Unable to open vector map <%s> at topology level %d"),
output->answer, 2);
}
Modified: grass/trunk/vector/v.net/report.c
===================================================================
--- grass/trunk/vector/v.net/report.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.net/report.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -64,12 +64,10 @@
nnodes++;
}
if (nnodes == 0)
- G_warning(_
- ("Point not found: %.3lf %.3lf %.3lf line category: %d"),
+ G_warning(_("Point not found: %.3lf %.3lf %.3lf line category: %d"),
x, y, z, cat_line);
else if (nnodes > 1)
- G_warning(_
- ("%d points found: %.3lf %.3lf %.3lf line category: %d"),
+ G_warning(_("%d points found: %.3lf %.3lf %.3lf line category: %d"),
nnodes, x, y, z, cat_line);
}
fprintf(stdout, "%d %d %d\n", cat_line, cat_node[0], cat_node[1]);
Modified: grass/trunk/vector/v.net.alloc/main.c
===================================================================
--- grass/trunk/vector/v.net.alloc/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.net.alloc/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -337,8 +337,7 @@
/* First segment */
ret = Vect_line_segment(Points, 0, l1, SPoints);
if (ret == 0) {
- G_warning(_
- ("Cannot get line segment, segment out of line"));
+ G_warning(_("Cannot get line segment, segment out of line"));
}
else {
cat = Centers[centre1].cat;
@@ -349,8 +348,7 @@
/* Second segment */
ret = Vect_line_segment(Points, l1, l, SPoints);
if (ret == 0) {
- G_warning(_
- ("Cannot get line segment, segment out of line"));
+ G_warning(_("Cannot get line segment, segment out of line"));
}
else {
Vect_reset_cats(Cats);
Modified: grass/trunk/vector/v.net.iso/main.c
===================================================================
--- grass/trunk/vector/v.net.iso/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.net.iso/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -175,8 +175,7 @@
/* Should not happen: */
if (niso < 2)
- G_warning(_
- ("Not enough costs, everything reachable falls to first band"));
+ G_warning(_("Not enough costs, everything reachable falls to first band"));
if (geo_f->answer)
geo = 1;
@@ -210,8 +209,7 @@
if (Vect_cat_in_cat_list(cat, catlist)) {
Vect_net_get_node_cost(&Map, node, &n1cost);
if (n1cost == -1) { /* closed */
- G_warning(_
- ("Centre at closed node (costs = -1) ignored"));
+ G_warning(_("Centre at closed node (costs = -1) ignored"));
}
else {
if (acentres == ncentres) {
@@ -233,8 +231,7 @@
G_message(_("Number of centres: [%d] (nlayer: [%d])"), ncentres, nfield);
if (ncentres == 0)
- G_warning(_
- ("Not enough centres for selected nlayer. Nothing will be allocated."));
+ G_warning(_("Not enough centres for selected nlayer. Nothing will be allocated."));
/* alloc and reset space for all nodes */
Nodes = (NODE *) G_calloc((nnodes + 1), sizeof(NODE));
@@ -513,8 +510,7 @@
Vect_line_segment(Points, pnts1[i - 1].distance,
pnts1[i].distance, SPoints);
if (ret == 0) {
- G_warning(_
- ("Cannot get line segment, segment out of line"));
+ G_warning(_("Cannot get line segment, segment out of line"));
}
else {
Vect_reset_cats(Cats);
Modified: grass/trunk/vector/v.out.ascii/out.c
===================================================================
--- grass/trunk/vector/v.out.ascii/out.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.out.ascii/out.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -122,8 +122,7 @@
/*The precision of the output */
if (dp_opt->answer) {
if (sscanf(dp_opt->answer, "%d", &dp) != 1)
- G_fatal_error(_
- ("Failed to interprete 'dp' parameter as an integer"));
+ G_fatal_error(_("Failed to interprete 'dp' parameter as an integer"));
}
Modified: grass/trunk/vector/v.out.ogr/main.c
===================================================================
--- grass/trunk/vector/v.out.ogr/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.out.ogr/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -309,8 +309,7 @@
doatt = 1; /* do attributes */
Fi = Vect_get_field(&In, field);
if (Fi == NULL) {
- G_warning(_
- ("No attribute table found -> using only category numbers as attributes"));
+ G_warning(_("No attribute table found -> using only category numbers as attributes"));
Ogr_field = OGR_Fld_Create("cat", OFTInteger);
OGR_L_CreateField(Ogr_layer, Ogr_field, 0);
@@ -325,8 +324,7 @@
db_init_handle(&handle);
db_set_handle(&handle, Fi->database, NULL);
if (db_open_database(Driver, &handle) != DB_OK)
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Fi->database, Fi->driver);
db_set_string(&dbstring, Fi->table);
@@ -396,15 +394,13 @@
if (Vect_get_num_primitives(&In, GV_BOUNDARY) > 0 &&
!(otype & GV_BOUNDARY) && !(otype & GV_AREA))
- G_warning(_
- ("%d boundary(ies) found, but not requested to be exported. "
+ G_warning(_("%d boundary(ies) found, but not requested to be exported. "
"Verify 'type' parameter."), Vect_get_num_primitives(&In,
GV_BOUNDARY));
if (Vect_get_num_primitives(&In, GV_CENTROID) > 0 &&
!(otype & GV_CENTROID) && !(otype & GV_AREA))
- G_warning(_
- ("%d centroid(s) found, but not requested to be exported. "
+ G_warning(_("%d centroid(s) found, but not requested to be exported. "
"Verify 'type' parameter."), Vect_get_num_primitives(&In,
GV_CENTROID));
Modified: grass/trunk/vector/v.out.vtk/main.c
===================================================================
--- grass/trunk/vector/v.out.vtk/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.out.vtk/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -171,8 +171,7 @@
/*The precision of the output */
if (dp_opt->answer) {
if (sscanf(dp_opt->answer, "%d", &dp) != 1)
- G_fatal_error(_
- ("Failed to interprete 'dp' parameter as an integer"));
+ G_fatal_error(_("Failed to interprete 'dp' parameter as an integer"));
if (dp > 8 || dp < 0)
G_fatal_error(_("dp has to be from 0 to 8"));
}
@@ -183,8 +182,7 @@
/*The Layer */
if (layer_opt->answer) {
if (sscanf(layer_opt->answer, "%d", &layer) != 1)
- G_fatal_error(_
- ("Failed to interprete 'layer' parameter as an integer"));
+ G_fatal_error(_("Failed to interprete 'layer' parameter as an integer"));
}
else {
layer = 1;
Modified: grass/trunk/vector/v.out.vtk/writeVTK.c
===================================================================
--- grass/trunk/vector/v.out.vtk/writeVTK.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.out.vtk/writeVTK.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -184,8 +184,7 @@
*/
/*break if nothing to generate */
if (info->maxnumpoints == 0)
- G_fatal_error(_
- ("No coordinates to generate the output! Maybe an empty vector type chosen?"));
+ G_fatal_error(_("No coordinates to generate the output! Maybe an empty vector type chosen?"));
/************************************************/
Modified: grass/trunk/vector/v.overlay/main.c
===================================================================
--- grass/trunk/vector/v.overlay/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.overlay/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -279,8 +279,7 @@
in_driver =
db_start_driver_open_database(inFi->driver, inFi->database);
if (in_driver == NULL) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
inFi->database, inFi->driver);
}
Modified: grass/trunk/vector/v.patch/main.c
===================================================================
--- grass/trunk/vector/v.patch/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.patch/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -130,8 +130,7 @@
db_start_driver_open_database(fi_out->driver,
fi_out->database);
if (!driver_out) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi_out->database, fi_out->driver);
}
@@ -161,8 +160,7 @@
db_start_driver_open_database(fi_in->driver,
fi_in->database);
if (!driver_in) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi_in->database, fi_in->driver);
}
@@ -274,8 +272,7 @@
db_start_driver_open_database(fi_out->driver,
fi_out->database);
if (!driver_out) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi_out->database, fi_out->driver);
}
db_begin_transaction(driver_out);
@@ -333,8 +330,7 @@
db_start_driver_open_database(fi_in->driver,
fi_in->database);
if (!driver_in) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi_in->database, fi_in->driver);
}
Modified: grass/trunk/vector/v.perturb/main.c
===================================================================
--- grass/trunk/vector/v.perturb/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.perturb/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -137,16 +137,14 @@
G_fatal_error(_("Error scanning arguments"));
}
else if (p1 <= 0)
- G_fatal_error(_
- ("Maximum of uniform distribution must be >= zero"));
+ G_fatal_error(_("Maximum of uniform distribution must be >= zero"));
}
else {
if ((i = sscanf(parm.pars->answer, "%lf,%lf", &p1, &p2)) != 2) {
G_fatal_error(_("Error scanning arguments"));
}
if (p2 <= 0)
- G_fatal_error(_
- ("Standard deviation of normal distribution must be >= zero"));
+ G_fatal_error(_("Standard deviation of normal distribution must be >= zero"));
}
G_get_window(&window);
Modified: grass/trunk/vector/v.proj/main.c
===================================================================
--- grass/trunk/vector/v.proj/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.proj/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -167,8 +167,7 @@
/* Make sure map is available */
mapset = G_find_vector2(map_name, iset_name);
if (mapset == NULL)
- G_fatal_error(_
- ("Vector map <%s> in location <%s> mapset <%s> not found"),
+ G_fatal_error(_("Vector map <%s> in location <%s> mapset <%s> not found"),
map_name, iloc_name, iset_name);
/*** Get projection info for input mapset ***/
@@ -192,8 +191,7 @@
{ /* allow 0 (i.e. denied permission) */
/* need to be able to read from others */
if (stat == 0)
- G_fatal_error(_
- ("Mapset <%s> in input location <%s> - permission denied"),
+ G_fatal_error(_("Mapset <%s> in input location <%s> - permission denied"),
iset_name, iloc_name);
else
G_fatal_error(_("Mapset <%s> in input location <%s> not found"),
Modified: grass/trunk/vector/v.random/main.c
===================================================================
--- grass/trunk/vector/v.random/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.random/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -134,8 +134,7 @@
exit(EXIT_FAILURE);
if (flag.z->answer && parm.zcol->answer) {
- G_fatal_error(_
- ("v.random can't create 3D vector and attribute table at same time"));
+ G_fatal_error(_("v.random can't create 3D vector and attribute table at same time"));
}
output = parm.output->answer;
@@ -218,8 +217,7 @@
db_close_database(driver);
db_shutdown_driver(driver);
Vect_delete(parm.output->answer);
- G_fatal_error(_
- ("You have created unsupported column type. This module supports only INTEGER"
+ G_fatal_error(_("You have created unsupported column type. This module supports only INTEGER"
" and DOUBLE PRECISION column types."));
}
}
Modified: grass/trunk/vector/v.reclass/main.c
===================================================================
--- grass/trunk/vector/v.reclass/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.reclass/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -358,8 +358,7 @@
}
}
if (over > 0)
- G_warning(_
- ("%d previously set categories overwritten by new category %d"),
+ G_warning(_("%d previously set categories overwritten by new category %d"),
over, cat);
for (i = 0; i < ncats; i++) {
Modified: grass/trunk/vector/v.sample/main.c
===================================================================
--- grass/trunk/vector/v.sample/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.sample/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -134,8 +134,7 @@
if (flag.B->answer)
method = BILINEAR;
if (flag.B->answer && flag.C->answer)
- G_fatal_error(_
- ("Flags -b & -c are mutually exclusive. Choose only one."));
+ G_fatal_error(_("Flags -b & -c are mutually exclusive. Choose only one."));
}
else {
method = NEAREST;
@@ -174,8 +173,7 @@
ctype = cvarr.ctype;
if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type <%s> not supported (must be integer or double precision)"),
+ G_fatal_error(_("Column type <%s> not supported (must be integer or double precision)"),
db_sqltype_name(ctype));
if (nrecords < 0)
Modified: grass/trunk/vector/v.segment/main.c
===================================================================
--- grass/trunk/vector/v.segment/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.segment/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -154,8 +154,7 @@
NULL);
if (ret == 0) {
len = Vect_line_length(LPoints);
- G_warning(_
- ("Unable to get point on line: cat = %d offset = %f "
+ G_warning(_("Unable to get point on line: cat = %d offset = %f "
"(line length = %.15g)\n%s"), lcat, offset1, len,
buf);
break;
Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.surf.idw/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -249,8 +249,7 @@
G_fatal_error(_("Unable to create raster map <%s>"),
parm.output->answer);
- G_important_message(_
- ("Interpolating raster map <%s> (%d rows, %d cols)... "),
+ G_important_message(_("Interpolating raster map <%s> (%d rows, %d cols)... "),
parm.output->answer, window.rows, window.cols);
north = window.north + window.ns_res / 2.0;
Modified: grass/trunk/vector/v.surf.rst/main.c
===================================================================
--- grass/trunk/vector/v.surf.rst/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.surf.rst/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -417,12 +417,10 @@
cv = flag.cv->answer;
if ((cv && cvdev == NULL) || (!(cv) && cvdev != NULL))
- G_fatal_error(_
- ("Both cross-validation options (-c flag and cvdev vector output) must be specified"));
+ G_fatal_error(_("Both cross-validation options (-c flag and cvdev vector output) must be specified"));
if ((elev != NULL || cond1 || cond2 || devi != NULL) && cv)
- G_fatal_error(_
- ("The cross-validation cannot be computed simultaneously with output raster or devi file"));
+ G_fatal_error(_("The cross-validation cannot be computed simultaneously with output raster or devi file"));
ertre = 0.1;
sscanf(parm.dmax->answer, "%lf", &dmax);
@@ -440,8 +438,7 @@
if (parm.scalex->answer) {
sscanf(parm.scalex->answer, "%lf", &scalex);
if (!parm.theta->answer)
- G_fatal_error(_
- ("Using anisotropy - both theta and scalex have to be specified"));
+ G_fatal_error(_("Using anisotropy - both theta and scalex have to be specified"));
}
if (parm.rsm->answer) {
@@ -449,8 +446,7 @@
if (rsm < 0.0)
G_fatal_error("Smoothing must be a positive value");
if (scol != NULL)
- G_warning(_
- ("Both smatt and smooth options specified - using constant"));
+ G_warning(_("Both smatt and smooth options specified - using constant"));
}
else {
sscanf(SMOOTH, "%lf", &rsm);
@@ -460,8 +456,7 @@
if (npmin > MAXPOINTS - 50) {
- G_warning(_
- ("The computation will last too long - lower npmin is suggested"));
+ G_warning(_("The computation will last too long - lower npmin is suggested"));
KMAX2 = 2 * npmin; /* was: KMAX2 = npmin + 50; */
}
else
@@ -608,8 +603,7 @@
Tmp_file_z);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_z)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
if (Tmp_file_dx != NULL) {
@@ -618,8 +612,7 @@
Tmp_file_dx);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_dx)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
if (Tmp_file_dy != NULL) {
@@ -628,8 +621,7 @@
Tmp_file_dy);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_dy)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
@@ -639,8 +631,7 @@
Tmp_file_xx);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_xx)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
if (Tmp_file_yy != NULL) {
@@ -649,8 +640,7 @@
Tmp_file_yy);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_yy)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
if (Tmp_file_xy != NULL) {
@@ -659,8 +649,7 @@
Tmp_file_xy);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_xy)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
Modified: grass/trunk/vector/v.to.db/main.c
===================================================================
--- grass/trunk/vector/v.to.db/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.db/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -44,8 +44,7 @@
Fi = Vect_get_field(&Map, options.field);
if (!options.print && Fi == NULL) {
- G_fatal_error(_
- ("Database connection not defined for layer %d. Use v.db.connect first."),
+ G_fatal_error(_("Database connection not defined for layer %d. Use v.db.connect first."),
options.field);
}
Modified: grass/trunk/vector/v.to.db/parse.c
===================================================================
--- grass/trunk/vector/v.to.db/parse.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.db/parse.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -155,14 +155,12 @@
}
if (options.option == O_QUERY && !parms.qcol->answers)
- G_fatal_error(_
- ("Parameter 'qcolumn' must be specified for 'option=query'"));
+ G_fatal_error(_("Parameter 'qcolumn' must be specified for 'option=query'"));
options.qcol = parms.qcol->answer;
if (options.option == O_SIDES && !(options.type | GV_BOUNDARY))
- G_fatal_error(_
- ("The 'sides' option makes sense only for boundaries"));
+ G_fatal_error(_("The 'sides' option makes sense only for boundaries"));
if (options.option == O_SINUOUS && !(options.type | GV_LINES))
G_fatal_error(_("The 'sinuous' option makes sense only for lines"));
Modified: grass/trunk/vector/v.to.db/query.c
===================================================================
--- grass/trunk/vector/v.to.db/query.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.db/query.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -79,8 +79,7 @@
db_init_string(&value_string);
if ((Fi = Vect_get_field(Map, options.qfield)) == NULL)
- G_fatal_error(_
- ("Database connection not defined for layer %d. Use v.db.connect first."),
+ G_fatal_error(_("Database connection not defined for layer %d. Use v.db.connect first."),
options.qfield);
/* Open driver */
@@ -105,8 +104,7 @@
/* Skip if cat is zero and large number of query categories (many features without category).
* It would cause problems on server side and take long time. Postgres limit is 10000 */
if (Values[i].cat == 0 && Values[i].nqcats > 1000) {
- G_warning(_
- ("Query for category '0' (no category) was not executed because of too many "
+ G_warning(_("Query for category '0' (no category) was not executed because of too many "
"(%d) query categories. All later reported values for cat 0 are not valid."),
Values[i].nqcats);
continue;
@@ -143,8 +141,7 @@
if (nrows != 1) {
if (nrows > 1) {
- G_warning(_
- ("Multiple query results, output value set to NULL (category [%d])"),
+ G_warning(_("Multiple query results, output value set to NULL (category [%d])"),
Values[i].cat);
}
Values[i].null = 1;
Modified: grass/trunk/vector/v.to.db/report.c
===================================================================
--- grass/trunk/vector/v.to.db/report.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.db/report.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -175,14 +175,12 @@
G_message(_("%d records selected from table"), vstat.select);
G_message(_("%d categories read from map exist in selection from table"),
vstat.exist);
- G_message(_
- ("%d categories read from map don't exist in selection from table"),
+ G_message(_("%d categories read from map don't exist in selection from table"),
vstat.notexist);
G_message(_("%d records updated/inserted"), vstat.update);
G_message(_("%d update/insert errors"), vstat.error);
if (vstat.dupl > 0)
- G_message(_
- ("%d categories with more points (coordinates not loaded)"),
+ G_message(_("%d categories with more points (coordinates not loaded)"),
vstat.dupl);
return 0;
Modified: grass/trunk/vector/v.to.db/update.c
===================================================================
--- grass/trunk/vector/v.to.db/update.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.db/update.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -23,8 +23,7 @@
db_init_string(&stmt);
if ((Fi = Vect_get_field(Map, options.field)) == NULL)
- G_fatal_error(_
- ("Database connection not defined for layer %d. Use v.db.connect first."),
+ G_fatal_error(_("Database connection not defined for layer %d. Use v.db.connect first."),
options.field);
/* Open driver */
@@ -96,8 +95,7 @@
case O_START:
case O_END:
if (Values[i].count1 > 1) {
- G_warning(_
- ("More elements of category [%d], nothing loaded to DB"),
+ G_warning(_("More elements of category [%d], nothing loaded to DB"),
Values[i].cat);
vstat.dupl++;
continue;
Modified: grass/trunk/vector/v.to.rast/do_lines.c
===================================================================
--- grass/trunk/vector/v.to.rast/do_lines.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.rast/do_lines.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -119,8 +119,7 @@
}
if (no_contour > 0)
- G_warning(_
- ("%d lines with varying height were not written to raster"),
+ G_warning(_("%d lines with varying height were not written to raster"),
no_contour);
Vect_destroy_cats_struct(Cats);
Modified: grass/trunk/vector/v.to.rast/main.c
===================================================================
--- grass/trunk/vector/v.to.rast/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.rast/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -107,26 +107,22 @@
case 'a':
use = USE_ATTR;
if (!col->answer)
- G_fatal_error(_
- ("Column parameter missing (or use value parameter)"));
+ G_fatal_error(_("Column parameter missing (or use value parameter)"));
break;
case 'c':
use = USE_CAT;
if (col->answer)
- G_fatal_error(_
- ("Column parameter cannot be combined with use of category values option"));
+ G_fatal_error(_("Column parameter cannot be combined with use of category values option"));
break;
case 'v':
use = USE_VAL;
if (col->answer || label_opt->answer || rgbcol_opt->answer)
- G_fatal_error(_
- ("Column parameter cannot be combined with use of value option"));
+ G_fatal_error(_("Column parameter cannot be combined with use of value option"));
break;
case 'z':
use = USE_Z;
if (col->answer || label_opt->answer || rgbcol_opt->answer)
- G_fatal_error(_
- ("Column parameter cannot be combined with use of z coordinate"));
+ G_fatal_error(_("Column parameter cannot be combined with use of z coordinate"));
break;
case 'd':
use = USE_D;
Modified: grass/trunk/vector/v.to.rast/support.c
===================================================================
--- grass/trunk/vector/v.to.rast/support.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.rast/support.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -274,15 +274,13 @@
db_CatValArray_init(&cvarr);
if (!(Fi = Vect_get_field(&Map, field)))
- G_fatal_error(_
- ("Database connection not defined for layer %d"),
+ G_fatal_error(_("Database connection not defined for layer %d"),
field);
if (!
(Driver =
db_start_driver_open_database(Fi->driver, Fi->database)))
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Fi->database, Fi->driver);
/* get number of records in label_column */
@@ -304,8 +302,7 @@
/* get column type */
if (!label_column) {
- G_warning(_
- ("Label column was not specified, no labels will be written"));
+ G_warning(_("Label column was not specified, no labels will be written"));
break;
}
else {
Modified: grass/trunk/vector/v.to.rast/vect2rast.c
===================================================================
--- grass/trunk/vector/v.to.rast/vect2rast.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.to.rast/vect2rast.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -66,8 +66,7 @@
ctype = cvarr.ctype;
if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type (%s) not supported (did you mean 'labelcolumn'?)"),
+ G_fatal_error(_("Column type (%s) not supported (did you mean 'labelcolumn'?)"),
db_sqltype_name(ctype));
if (nrec < 0)
@@ -162,8 +161,7 @@
if (do_areas
(&Map, Points, &cvarr, ctype, field, use, value,
value_type) < 0) {
- G_warning(_
- ("Problem processing areas from vector map <%s>, continuing..."),
+ G_warning(_("Problem processing areas from vector map <%s>, continuing..."),
vector_map);
stat = -1;
break;
@@ -174,8 +172,7 @@
if ((nlines =
do_lines(&Map, Points, &cvarr, ctype, field, use, value,
value_type, ftype, &nplines_all)) < 0) {
- G_warning(_
- ("Problem processing lines from vector map <%s>, continuing..."),
+ G_warning(_("Problem processing lines from vector map <%s>, continuing..."),
vector_map);
stat = -1;
break;
@@ -209,8 +206,7 @@
/* colors */
if (rgbcolumn) {
if (use != USE_ATTR) {
- G_warning(_
- ("Color can be updated from database only if use=attr"));
+ G_warning(_("Color can be updated from database only if use=attr"));
update_colors(raster_map);
}
Modified: grass/trunk/vector/v.transform/main.c
===================================================================
--- grass/trunk/vector/v.transform/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.transform/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -198,27 +198,23 @@
/* please remove in GRASS7 */
if (shift_flag->answer)
- G_warning(_
- ("The '%c' flag is deprecated and will be removed in future. "
+ G_warning(_("The '%c' flag is deprecated and will be removed in future. "
"Transformation parameters are used automatically when no pointsfile is given."),
shift_flag->key);
if (quiet_flag->answer) {
- G_warning(_
- ("The '%c' flag is deprecated and will be removed in future. "
+ G_warning(_("The '%c' flag is deprecated and will be removed in future. "
"Please use '--quiet' instead."), quiet_flag->key);
G_putenv("GRASS_VERBOSE", "0");
}
if (!table->answer && columns->answer) {
- G_fatal_error(_
- ("Table name is not defined. Please use '%s' parameter."),
+ G_fatal_error(_("Table name is not defined. Please use '%s' parameter."),
table->key);
}
if (table->answer && strcmp(vnew->answer, table->answer) == 0) {
- G_fatal_error(_
- ("Name of table and name for output vector map must be different. "
+ G_fatal_error(_("Name of table and name for output vector map must be different. "
"Otherwise the table is overwritten."));
}
Modified: grass/trunk/vector/v.transform/trans_digit.c
===================================================================
--- grass/trunk/vector/v.transform/trans_digit.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.transform/trans_digit.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -101,8 +101,7 @@
|| db_test_value_isnull(&val)) {
trans_params[j] = trans_params_def[j];
- G_warning(_
- ("Unable to select value for category %d from table <%s>, column <%s>. "
+ G_warning(_("Unable to select value for category %d from table <%s>, column <%s>. "
"For category %d using default transformation parameter %.3f."),
cat, table, columns[j], cat,
trans_params[j]);
@@ -113,8 +112,7 @@
}
}
else {
- G_warning(_
- ("No category number defined. Using default transformation parameters."));
+ G_warning(_("No category number defined. Using default transformation parameters."));
for (j = 0; j <= IDX_ZROT; j++) {
trans_params[j] = trans_params_def[j];
Modified: grass/trunk/vector/v.univar/main.c
===================================================================
--- grass/trunk/vector/v.univar/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.univar/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -125,14 +125,12 @@
compatible = 0;
if (!compatible) {
- G_warning(_
- ("Incompatible vector type(s) specified, only number of features, minimum, maximum and range "
+ G_warning(_("Incompatible vector type(s) specified, only number of features, minimum, maximum and range "
"can be calculated"));
}
if (extended->answer && !(otype & GV_POINTS)) {
- G_warning(_
- ("Extended statistics is currently supported only for points/centroids"));
+ G_warning(_("Extended statistics is currently supported only for points/centroids"));
}
/* Read attributes */
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.vol.rst/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -463,11 +463,9 @@
rsm = -1; /* used in InterpLib to indicate variable smoothing */
if (cv != (cvdev != NULL))
- G_fatal_error(_
- ("Both crossvalidation options (-c, cvdev) must be specified"));
+ G_fatal_error(_("Both crossvalidation options (-c, cvdev) must be specified"));
if (cv && devi != NULL)
- G_fatal_error(_
- ("Both crossvalidation and deviations file specified"));
+ G_fatal_error(_("Both crossvalidation and deviations file specified"));
if (cellinp == NULL && outz == NULL && cellout == NULL && gradient == NULL
&& aspect1 == NULL && aspect2 == NULL && ncurv == NULL &&
gcurv == NULL && mcurv == NULL) {
Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.vol.rst/user1.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -104,8 +104,7 @@
G_debug(3, "nrec = %d", nrec);
if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type of wcolumn is not supported (must be integer or double)"));
+ G_fatal_error(_("Column type of wcolumn is not supported (must be integer or double)"));
if (nrec < 0)
G_fatal_error("Unable to select data from table");
@@ -124,8 +123,7 @@
G_fatal_error
("Column type of smooth column (datetime) is not supported");
if (sctype != DB_C_TYPE_INT && sctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type of smooth column is not supported (must be integer or double)"));
+ G_fatal_error(_("Column type of smooth column is not supported (must be integer or double)"));
}
Points = Vect_new_line_struct();
Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c 2008-08-06 22:02:30 UTC (rev 32586)
+++ grass/trunk/vector/v.what.rast/main.c 2008-08-06 22:06:12 UTC (rev 32587)
@@ -163,8 +163,7 @@
G_warning(_("Raster type is integer and column type is float"));
if (out_type != CELL_TYPE && col_type == DB_C_TYPE_INT)
- G_warning(_
- ("Raster type is float and column type is integer, some data lost!!"));
+ G_warning(_("Raster type is float and column type is integer, some data lost!!"));
/* Read vector points to cache */
Cache_size = Vect_get_num_primitives(&Map, GV_POINT);
@@ -302,8 +301,7 @@
for (point = 0; point < point_cnt; point++) {
if (cache[point].count > 1) {
- G_warning(_
- ("More points (%d) of category %d, value set to 'NULL'"),
+ G_warning(_("More points (%d) of category %d, value set to 'NULL'"),
cache[point].count, cache[point].cat);
dupl_cnt++;
}
More information about the grass-commit
mailing list