[GRASS-SVN] r53012 - in grass/trunk: raster/r.to.rast3 raster/r.to.rast3elev raster3d/r3.out.vtk

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Aug 31 03:34:33 PDT 2012


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

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

Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c	2012-08-31 10:34:23 UTC (rev 53011)
+++ grass/trunk/raster/r.to.rast3/main.c	2012-08-31 10:34:32 UTC (rev 53012)
@@ -90,7 +90,7 @@
 
     param.mask = G_define_flag();
     param.mask->key = 'm';
-    param.mask->description = _("Use RASTER3D mask (if exists) with output map");
+    param.mask->description = _("Use 3D raster mask (if exists) with output map");
 
 }
 
@@ -227,7 +227,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;
@@ -288,7 +288,7 @@
     map = Rast3d_open_new_opt_tile_size(param.output->answer, RASTER3D_USE_CACHE_XY, &region, globalG3dMapType, maxSize);
 
     if (map == NULL)
-        fatal_error(map, fd, opencells, _("Error opening 3d raster map"));
+        fatal_error(map, fd, opencells, _("Error opening 3D raster map"));
 
     /*if requested set the Mask on */
     if (param.mask->answer) {

Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c	2012-08-31 10:34:23 UTC (rev 53011)
+++ grass/trunk/raster/r.to.rast3elev/main.c	2012-08-31 10:34:32 UTC (rev 53012)
@@ -191,7 +191,7 @@
 
     param.mask = G_define_flag();
     param.mask->key = 'm';
-    param.mask->description = _("Use RASTER3D mask (if exists) with input map");
+    param.mask->description = _("Use 3D raster mask (if exists) with input map");
 
     return;
 }
@@ -284,7 +284,7 @@
 
                     /*Write the value to the 3D map */
                     if (Rast3d_put_double(db.map, x, y, z, value) < 0)
-                        fatal_error(db, _("Error writing RASTER3D double data"));
+                        fatal_error(db, _("Error writing 3D raster double data"));
                 }
             } else {
                 /*Use this method for every following 3d raster maps access */
@@ -317,7 +317,7 @@
 
                     /*Write the value to the 3D map */
                     if (Rast3d_put_double(db.map, x, y, z, value) < 0)
-                        fatal_error(db, _("Error writing RASTER3D double data"));
+                        fatal_error(db, _("Error writing 3D raster double data"));
 
                 }
             }
@@ -424,7 +424,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;
@@ -440,7 +440,7 @@
     db.map = Rast3d_open_new_opt_tile_size(param.output->answer, RASTER3D_USE_CACHE_XY, &region, DCELL_TYPE, maxSize);
 
     if (db.map == NULL)
-        fatal_error(db, _("Error opening 3d raster map"));
+        fatal_error(db, _("Error opening 3D raster map"));
 
 
     /*if requested set the Mask on */

Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c	2012-08-31 10:34:23 UTC (rev 53011)
+++ grass/trunk/raster3d/r3.out.vtk/main.c	2012-08-31 10:34:32 UTC (rev 53012)
@@ -165,7 +165,7 @@
                     Rast3d_fatal_error(_("3D vector map <%s> not found"),
                                    param.vectormaps->answers[i]);
             } else {
-                Rast3d_fatal_error(_("Please provide three G3D vector maps [x,y,z]"));
+                Rast3d_fatal_error(_("Please provide three 3D raster maps for the xyz-vector maps [x,y,z]"));
             }
         }
     }



More information about the grass-commit mailing list