[GRASS-SVN] r53011 - in grass/branches/develbranch_6: raster/r.to.rast3 raster/r.to.rast3elev raster3d/r3.out.vtk

[svn_grass at osgeo.org]

Author: neteler
Date: 2012-08-31 03:34:23 -0700 (Fri, 31 Aug 2012)
New Revision: 53011

Modified:
   grass/branches/develbranch_6/raster/r.to.rast3/main.c
   grass/branches/develbranch_6/raster/r.to.rast3elev/main.c
   grass/branches/develbranch_6/raster3d/r3.out.vtk/main.c
Log:
Milena Nowotarska: msg standardization

Modified: grass/branches/develbranch_6/raster/r.to.rast3/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.rast3/main.c	2012-08-31 10:34:09 UTC (rev 53010)
+++ grass/branches/develbranch_6/raster/r.to.rast3/main.c	2012-08-31 10:34:23 UTC (rev 53011)
@@ -80,7 +80,7 @@
 
     param.mask = G_define_flag();
     param.mask->key = 'm';
-    param.mask->description = _("Use G3D mask (if exists) with output map");
+    param.mask->description = _("Use 3D raster mask (if exists) with output map");
 
 }
 
@@ -219,7 +219,7 @@
 
     /*If not equal, set the 2D windows correct */
     if (rows != region.rows || cols != region.cols) {
-	G_message(_("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
+	G_message(_("The 2D and 3D region settings are different. I will use the 3D region settings to adjust the 2D region."));
 	G_get_set_window(&window2d);
 	window2d.ns_res = region.ns_res;
 	window2d.ew_res = region.ew_res;

Modified: grass/branches/develbranch_6/raster/r.to.rast3elev/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.rast3elev/main.c	2012-08-31 10:34:09 UTC (rev 53010)
+++ grass/branches/develbranch_6/raster/r.to.rast3elev/main.c	2012-08-31 10:34:23 UTC (rev 53011)
@@ -229,7 +229,7 @@
 
     param.mask = G_define_flag();
     param.mask->key = 'm';
-    param.mask->description = _("Use G3D mask (if exists) with input map");
+    param.mask->description = _("Use 3D raster mask (if exists) with input map");
 
     return;
 }
@@ -323,7 +323,7 @@
 
 		    /*Write the value to the 3D map */
 		    if (G3d_putDouble(db.map, x, y, z, value) < 0)
-			fatal_error(db, _("Error writing G3D double data"));
+			fatal_error(db, _("Error writing 3D raster double data"));
 		}
 	    }
 	    else {
@@ -357,7 +357,7 @@
 
 		    /*Write the value to the 3D map */
 		    if (G3d_putDouble(db.map, x, y, z, value) < 0)
-			fatal_error(db, _("Error writing G3D double data"));
+			fatal_error(db, _("Error writing 3D raster double data"));
 
 		}
 	    }
@@ -459,7 +459,7 @@
 
     /*If not equal, set the 2D windows correct */
     if (rows != region.rows || cols != region.cols) {
-	G_message(_("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
+	G_message(_("The 2D and 3D region settings are different. I will use the 3D region settings to adjust the 2D region."));
 	G_get_set_window(&window2d);
 	window2d.ns_res = region.ns_res;
 	window2d.ew_res = region.ew_res;

Modified: grass/branches/develbranch_6/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.vtk/main.c	2012-08-31 10:34:09 UTC (rev 53010)
+++ grass/branches/develbranch_6/raster3d/r3.out.vtk/main.c	2012-08-31 10:34:23 UTC (rev 53011)
@@ -168,7 +168,7 @@
 				   param.vectormaps->answers[i]);
 	    }
 	    else {
-		G3d_fatalError(_("Please provide three G3D vector maps [x,y,z]"));
+		G3d_fatalError(_("Please provide three 3D raster maps for the xyz-vector maps [x,y,z]"));
 	    }
 	}
     }