more msg standardization

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

raster3d/r3.gwflow/main.c

@@ -409,7 +409,7 @@ write_result(N_array_3d * status, N_array_3d * phead_start,
     if (!Rast3d_flush_all_tiles(map))
 	Rast3d_fatal_error("Error flushing tiles with Rast3d_flush_all_tiles");
     if (!Rast3d_close(map))
-	Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file"));
+	Rast3d_fatal_error(map, NULL, 0, _("Unable to close 3D raster map"));
 
     return;
 }

raster3d/r3.in.ascii/r3.in.ascii.html

@@ -13,11 +13,6 @@ Default is <em>none</em>.
 
 <h2>NOTES</h2>
 
-A detailed description of the input format as well as the supported row/depth 
-ordering is available in the <a href="r3.out.ascii.html">r3.out.ascii</a>.
-manual page. The order of the data in the input file does not specifiy the
-data order in the generated output 3D raster map which is in any case 
-<em>north -> south, west -> east, bottom -> top</em> order.
 The data is automatically imported into the correct internal coordinate system,
 that is visualized in the following picture, independently from the specified
 ordering in the ASCII input file:

raster3d/r3.mkdspf/calc_linefax.c

@@ -30,12 +30,12 @@ int viz_calc_tvals(cmndln_info * linefax, char **a_levels, char *a_min,
 	sscanf(a_max, "%f", &max);
     datarange = max - min;
     if (datarange <= 0.0)
-	G_fatal_error("range error: %f", datarange);
+	G_fatal_error("Range error: %f", datarange);
 
     if (a_levels) {
 	for (i = 0; a_levels[i]; i++) {
 	    if (i == MAXTHRESH) {
-		G_warning("maximum no. of thresholds is %d", MAXTHRESH);
+		G_warning("Maximum no. of thresholds is %d", MAXTHRESH);
 		break;
 	    }
 	    if (1 != sscanf(a_levels[i], "%f", &(linefax->tvalue[i]))) {
@@ -66,7 +66,7 @@ int viz_calc_tvals(cmndln_info * linefax, char **a_levels, char *a_min,
     if (do_interval) {
 	for (i = 0, tval = min; tval <= max; i++, tval = min + (i * interval)) {
 	    if (i == MAXTHRESH) {
-		G_warning("maximum no. of thresholds is %d", MAXTHRESH);
+		G_warning("Maximum no. of thresholds is %d", MAXTHRESH);
 		break;
 	    }
 	    linefax->tvalue[i] = tval;
@@ -79,7 +79,7 @@ int viz_calc_tvals(cmndln_info * linefax, char **a_levels, char *a_min,
 	fprintf(stderr, "threshold values: ");
 	for (i = 0; i < linefax->nthres; i++)
 	    fprintf(stderr, "%f ", linefax->tvalue[i]);
-	G_message("\nNo. of thresholds: %i", linefax->nthres + 1);
+	G_message("No. of thresholds: %i", linefax->nthres + 1);
 
     }
 

raster3d/r3.mkdspf/main.c

@@ -164,10 +164,10 @@ int main(int argc, char *argv[])
      */
 
     if (NULL == g3map)
-	G_fatal_error(_("Error opening grid3 file [%s]"), name->answer);
+	G_fatal_error(_("Unable to open 3D raster map <%s>"), name->answer);
 
     if (0 == Rast3d_range_load(g3map))
-	G_fatal_error(_("Error reading range for [%s]"), name->answer);
+	G_fatal_error(_("Unable to read range of 3D raster map <%s>"), name->answer);
 
     /* TODO: look at this - should use current 3dregion rather than
        region represented by original 3dgrid file */
@@ -196,7 +196,7 @@ int main(int argc, char *argv[])
     /* open display file for writing */
     sprintf(element, "grid3/%s/dsp", name->answer);
     if ((Headfax.dspfoutfp = G_fopen_new(element, dspout)) == NULL)
-	G_fatal_error(_("Error opening display file [%s]"), dspout);
+	G_fatal_error(_("Unable to open display file <%s>"), dspout);
 
     /* write display file header info */
     /* have to adjust dimensions  -dpg */

raster3d/r3.mkdspf/r3_find.c

@@ -31,7 +31,7 @@ int g3_find_dsp_file(const char *cell, const char *file, const char *mset)
 const char *check_get_any_dspname(const char *dspf, const char *g3f, const char *mset)
 {
     if (!G_find_raster3d(g3f, ""))
-	G_fatal_error("[%s] 3D raster map not found", g3f);
+	G_fatal_error("3D raster map <%s> not found", g3f);
 
     if (mset) {			/* otherwise must be reading only  */
 	if (g3_find_dsp_file(g3f, dspf, mset)) {	/* already exists */

raster3d/r3.null/main.c

@@ -165,7 +165,7 @@ modifyNull(char *name, d_Mask * maskRules, int changeNull, double newNullVal)
     Rast3d_unlock_all(mapOut);
 
     if (!Rast3d_close(map))
-	Rast3d_fatal_error(_("Unable to close raster map"));
+	Rast3d_fatal_error(_("Unable to close 3D raster map <%s>"), name);
     if (!Rast3d_close(mapOut))
 	Rast3d_fatal_error(_("modifyNull: Unable to close tmp file"));
 }

raster3d/r3.out.ascii/main.c

@@ -337,7 +337,7 @@ int main(int argc, char *argv[])
                           RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)
-        Rast3d_fatal_error(_("Error opening 3d raster map <%s>"), input);
+        Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"), input);
 
     /* Open the output ascii file */
     fp = openAscii(output, region);

raster3d/r3.out.bin/main.c

@@ -311,7 +311,7 @@ int main(int argc, char *argv[]) {
 			RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
 	if (map == NULL)
-		Rast3d_fatal_error(_("Error opening 3d raster map <%s>"),
+		Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"),
 				parm.input->answer);
 
 	/* open bin file for writing */

raster3d/r3.out.netcdf/main.c

@@ -613,7 +613,7 @@ int main(int argc, char *argv[])
 			     RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)
-	G_fatal_error(_("Error opening 3d raster map <%s>"),
+	G_fatal_error(_("Unable to open 3D raster map <%s>"),
 		      param.input->answer);
 
     /* Create netCDF file */

raster3d/r3.out.vtk/writeVTKData.c

@@ -438,7 +438,7 @@ void write_vtk_rgb_data(void *map_r, void *map_g, void *map_b,
                                                        0.0);
                     /*Test of value range, the data should be 1 byte gray values */
                     if (value > 255 || value < 0) {
-                        G_warning(_("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
+                        G_warning(_("Wrong 3D raster map values! Values should in between 0 and 255!"));
                         fprintf(fp, "0 ");
                     } else {
 

raster3d/r3.out.vtk/writeVTKHead.c

@@ -37,7 +37,7 @@ void write_vtk_structured_point_header(FILE * fp, char *vtkFile,
                                        double scale)
 {
     G_debug(3,
-            _("write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"));
+            "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header");
 
     /*Simple vtk ASCII header */
 
@@ -93,7 +93,7 @@ void write_vtk_structured_grid_header(FILE * fp, char *vtkFile,
                                       RASTER3D_Region region)
 {
     G_debug(3,
-            _("write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header"));
+            "write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header");
     fprintf(fp, "# vtk DataFile Version 3.0\n");
     fprintf(fp, "GRASS GIS 7 Export\n");
     fprintf(fp, "ASCII\n");
@@ -115,7 +115,7 @@ void write_vtk_unstructured_grid_header(FILE * fp, char *vtkFile,
                                         RASTER3D_Region region)
 {
     G_debug(3,
-            _("write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"));
+            "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header");
     fprintf(fp, "# vtk DataFile Version 3.0\n");
     fprintf(fp, "GRASS GIS 7 Export\n");
     fprintf(fp, "ASCII\n");

raster3d/r3.retile/main.c

@@ -11,8 +11,8 @@
  * COPYRIGHT:    (C) 2011 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
- *   	    	License (>=v2). Read the file COPYING that comes with GRASS
- *   	    	for details.
+ *               License (>=v2). Read the file COPYING that comes with GRASS
+ *               for details.
  *
  *****************************************************************************/
 #include <stdio.h>
@@ -46,7 +46,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg)
     /* Close files and exit */
     if (map != NULL) {
         if (!Rast3d_close(map))
-            Rast3d_fatal_error(_("Unable to close the 3d raster map"));
+            Rast3d_fatal_error(_("Unable to close the 3D raster map"));
     }
 
     if (fd != NULL) {
@@ -105,12 +105,12 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
         exit(EXIT_FAILURE);
 
-    G_debug(3, "Open 3d raster map <%s>", param.input->answer);
+    G_debug(3, "Open 3D raster map <%s>", param.input->answer);
 
     mapset = G_find_raster3d(param.input->answer, "");
     
     if (mapset == NULL)
-        Rast3d_fatal_error(_("3d raster map <%s> not found"),
+        Rast3d_fatal_error(_("3D raster map <%s> not found"),
                        param.input->answer);
 
     /*Set the defaults */
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
                           RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
 
     if (map == NULL)
-        Rast3d_fatal_error(_("Unable to open 3d raster map <%s>"),
+        Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"),
                        param.input->answer);
 
     /* Get the tile dimension */
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
 
     /* Close files and exit */
     if (!Rast3d_close(map))
-        fatal_error(map, NULL, 0, _("Error closing 3d raster map"));
+        fatal_error(map, NULL, 0, _("Error closing 3D raster map"));
 
     map = NULL;
 

raster3d/r3.showdspf/r3_find.c

@@ -36,7 +36,7 @@ char *check_get_any_dspname(dspf, g3f, mset)
     static char dspout[200];
 
     if (!G_find_raster3d(g3f, "")) {
-	fprintf(stderr, "[%s] 3D raster map not found\n", g3f);
+	fprintf(stderr, "3D raster map <%s> not found", g3f);
 	return (NULL);
     }
 

raster3d/r3.support/check.c

@@ -17,7 +17,7 @@ int check_stats(const char *name)
     struct FPRange fprange;
     int cats_ok;
 
-    G_message(_("\n  Updating statistics for [%s]"), name);
+    G_message(_("Updating statistics for <%s>"), name);
     
     /* Get category status and max */
     cats_ok = (Rast3d_read_cats(name, "", &cats) >= 0);
@@ -33,8 +33,7 @@ int check_stats(const char *name)
 
     /* Update categories if needed */
     if (!cats_ok) {
-	G_message(_("   Updating the number of categories for "
-		    "[%s]\n\n"), name);
+	G_message(_("Updating the number of categories for <%s>"), name);
 	Rast3d_write_cats(name, &cats);
     }
     Rast_free_cats(&cats);

raster3d/r3.support/main.c

@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
     infile = raster->answer;
     mapset = G_find_raster3d(infile, G_mapset());	/* current mapset only for editing */
     if (!mapset || strcmp(mapset, G_mapset()) != 0)
-	G_fatal_error(_("Raster3d map <%s> not found in current mapset"), infile);
+	G_fatal_error(_("3D raster map <%s> not found"), infile);
 
     if (title_opt->answer) {
 	strncpy(title, title_opt->answer, MAX_TITLE_LEN);

raster3d/r3.timestamp/r3.timestamp.main.c

@@ -67,8 +67,7 @@ int main(int argc, char *argv[])
 	mapset = G_find_raster3d(name, "");
 
     if (mapset == NULL) {
-	G_fatal_error(_("Raster3d map <%s> not found %s"), name,
-		      modify ? "in current mapset" : "");
+	G_fatal_error(_("3D raster map <%s> not found"), name);
 	exit(EXIT_FAILURE);
     }
 
@@ -86,7 +85,7 @@ int main(int argc, char *argv[])
     }
 
     if(G_scan_timestamp(&ts, date->answer) != 1)
-        G_fatal_error("Timestamp format is invalid");
+        G_fatal_error(_("Timestamp format is invalid"));
 
     G_write_raster3d_timestamp(name, &ts);
     exit(EXIT_SUCCESS);

raster3d/r3.to.rast/main.c

@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
         exit(EXIT_FAILURE);
 
-    G_debug(3, _("Open 3D raster map <%s>"), param.input->answer);
+    G_debug(3, "Open 3D raster map <%s>", param.input->answer);
 
     if (NULL == G_find_raster3d(param.input->answer, ""))
         Rast3d_fatal_error(_("3D raster map <%s> not found"),
@@ -234,7 +234,7 @@ int main(int argc, char *argv[])
                               RASTER3D_DEFAULT_WINDOW, RASTER3D_TILE_SAME_AS_FILE,
                               RASTER3D_USE_CACHE_DEFAULT);
         if (map == NULL)
-            Rast3d_fatal_error(_("Error opening 3D raster map <%s>"),
+            Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"),
                            param.input->answer);
 
 
@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
                               RASTER3D_USE_CACHE_DEFAULT);
 
         if (map == NULL)
-            Rast3d_fatal_error(_("Error opening 3D raster map <%s>"),
+            Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"),
                            param.input->answer);
     }