[GRASS-SVN] r47802 - in grass/branches/releasebranch_6_4/raster3d: r3.out.v5d r3.out.vtk r3.to.rast

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-08-21 14:05:58 -0700 (Sun, 21 Aug 2011)
New Revision: 47802

Modified:
   grass/branches/releasebranch_6_4/raster3d/r3.out.v5d/main.c
   grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/errorHandling.c
   grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/main.c
   grass/branches/releasebranch_6_4/raster3d/r3.to.rast/main.c
Log:
i18n polishing

Modified: grass/branches/releasebranch_6_4/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.out.v5d/main.c	2011-08-21 20:55:03 UTC (rev 47801)
+++ grass/branches/releasebranch_6_4/raster3d/r3.out.v5d/main.c	2011-08-21 21:05:58 UTC (rev 47802)
@@ -261,7 +261,7 @@
 
     /* Write the v5d file */
     if (!v5dWrite(1, 1, g))
-	G_fatal_error(_("Error writing V5D file"));
+	G_fatal_error(_("Failed writing V5D file"));
 
     /* Close the v5d file */
     v5dClose();

Modified: grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/errorHandling.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/errorHandling.c	2011-08-21 20:55:03 UTC (rev 47801)
+++ grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/errorHandling.c	2011-08-21 21:05:58 UTC (rev 47802)
@@ -32,14 +32,14 @@
 /* ************************************************************************* */
 /* Error handling ********************************************************** */
 /* ************************************************************************* */
-void fatal_error(char *errorMsg, input_maps * in)
+void fatal_error(char *errorMsg, input_maps *in)
 {
-    G_warning("%s\n", errorMsg);
+    G_warning("%s", errorMsg);
 
     /*close all open maps and free memory */
     release_input_maps_struct(in);
 
-    G3d_fatalError("Break because of errors.");
+    G3d_fatalError("Break because of errors");
 }
 
 /* ************************************************************************* */
@@ -49,7 +49,7 @@
 {
     if (fd != -1)
 	if (G_close_cell(fd) < 0) {
-	    G_warning(_("unable to close input raster map"));
+	    G_warning(_("Unable to close input raster map"));
 	    return 1;
 	}
 
@@ -64,7 +64,7 @@
 {
     if (map != NULL) {
 	if (!G3d_closeCell(map)) {
-	    G_warning(_("unable to close input 3d raster map"));
+	    G_warning(_("Unable to close 3D raster map <%s>"), map);
 	    return 1;
 	}
     }
@@ -104,7 +104,7 @@
     free(in);
 
     if (error > 0)
-	G3d_fatalError("Error while closing the input maps");
+	G3d_fatalError(_("Unable to close input raster maps"));
 
     return;
 }

Modified: grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/main.c	2011-08-21 20:55:03 UTC (rev 47801)
+++ grass/branches/releasebranch_6_4/raster3d/r3.out.vtk/main.c	2011-08-21 21:05:58 UTC (rev 47802)
@@ -448,7 +448,8 @@
 
 	/*If not equal, set the 2D windows correct */
 	if (rows != region.rows || cols != region.cols) {
-	    G_message(_("The 2d and 3d region settings are different. The g3d settings are used to adjust the 2d region."));
+	    G_message(_("The 2D and 3D region settings are different. "
+			"Using the 2D window settings to adjust the 2D part of the 3D region."));
 	    G_get_set_window(&window2d);
 	    window2d.ns_res = region.ns_res;
 	    window2d.ew_res = region.ew_res;

Modified: grass/branches/releasebranch_6_4/raster3d/r3.to.rast/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster3d/r3.to.rast/main.c	2011-08-21 20:55:03 UTC (rev 47801)
+++ grass/branches/releasebranch_6_4/raster3d/r3.to.rast/main.c	2011-08-21 21:05:58 UTC (rev 47802)
@@ -240,13 +240,13 @@
 			      G3D_DEFAULT_WINDOW, G3D_TILE_SAME_AS_FILE,
 			      G3D_USE_CACHE_DEFAULT);
 	if (map == NULL)
-	    G3d_fatalError(_("Error opening 3d raster map <%s>"),
+	    G3d_fatalError(_("Error opening 3D raster map <%s>"),
 			   param.input->answer);
 
 
 	/*Get the region of the map */
 	G3d_getRegionStructMap(map, &region);
-	/*set this region as current 3d window for map */
+	/*set this region as current 3D window for map */
 	G3d_setWindowMap(map, &region);
 	/*Set the 2d region appropriate */
 	G3d_extract2dRegion(&region, &region2d);
@@ -264,7 +264,7 @@
 
 	/*If not equal, set the 3D window correct */
 	if (rows != region.rows || cols != region.cols) {
-	    G_message(_("The 2d and 3d region settings are different. "
+	    G_message(_("The 2D and 3D region settings are different. "
 			"Using the 2D window settings to adjust the 2D part of the 3D region."));
 	    G_get_set_window(&region2d);
 	    region.ns_res = region2d.ns_res;
@@ -274,14 +274,14 @@
 	    G3d_setWindow(&region);
 	}
 
-	/*Open the 3d raster map */
+	/*Open the 3D raster map */
 	map = G3d_openCellOld(param.input->answer,
 			      G_find_grid3(param.input->answer, ""),
 			      &region, G3D_TILE_SAME_AS_FILE,
 			      G3D_USE_CACHE_DEFAULT);
 
 	if (map == NULL)
-	    G3d_fatalError(_("Error opening 3d raster map <%s>"),
+	    G3d_fatalError(_("Error opening 3D raster map <%s>"),
 			   param.input->answer);
     }
 
@@ -387,7 +387,7 @@
 
     /* Close files and exit */
     if (!G3d_closeCell(map))
-	fatal_error(map, NULL, 0, _("Error closing 3d raster map"));
+	fatal_error(map, NULL, 0, _("Unable to close 3D raster map"));
 
     map = NULL;