[GRASS-SVN] r47804 - in grass/trunk/raster3d: r3.out.v5d r3.out.vtk r3.to.rast

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-08-21 14:12:15 -0700 (Sun, 21 Aug 2011)
New Revision: 47804

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

Modified: grass/trunk/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/main.c	2011-08-21 21:06:15 UTC (rev 47803)
+++ grass/trunk/raster3d/r3.out.v5d/main.c	2011-08-21 21:12:15 UTC (rev 47804)
@@ -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/trunk/raster3d/r3.out.vtk/errorHandling.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/errorHandling.c	2011-08-21 21:06:15 UTC (rev 47803)
+++ grass/trunk/raster3d/r3.out.vtk/errorHandling.c	2011-08-21 21:12:15 UTC (rev 47804)
@@ -35,7 +35,7 @@
 /* ************************************************************************* */
 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);
@@ -62,7 +62,7 @@
 {
     if (map != NULL) {
 	if (!Rast3d_close(map)) {
-	    G_warning(_("unable to close input 3d raster map"));
+	    G_warning(_("Unable to close 3D raster map <%s>"), map);
 	    return 1;
 	}
     }
@@ -102,7 +102,7 @@
     free(in);
 
     if (error > 0)
-	Rast3d_fatal_error("Error while closing the input maps");
+	Rast3d_fatal_error(_("Unable to close input raster maps"));
 
     return;
 }

Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c	2011-08-21 21:06:15 UTC (rev 47803)
+++ grass/trunk/raster3d/r3.out.vtk/main.c	2011-08-21 21:12:15 UTC (rev 47804)
@@ -447,7 +447,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/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c	2011-08-21 21:06:15 UTC (rev 47803)
+++ grass/trunk/raster3d/r3.to.rast/main.c	2011-08-21 21:12:15 UTC (rev 47804)
@@ -52,7 +52,7 @@
     /* Close files and exit */
     if (map != NULL) {
         if (!Rast3d_close(map))
-            Rast3d_fatal_error(_("Unable to close 3Draster map"));
+            Rast3d_fatal_error(_("Unable to close 3D raster map"));
     }
 
     if (fd != NULL) {
@@ -233,13 +233,13 @@
                               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(_("Error opening 3D raster map <%s>"),
                            param.input->answer);
 
 
         /*Get the region of the map */
         Rast3d_get_region_struct_map(map, &region);
-        /*set this region as current 3d window for map */
+        /*set this region as current 3D window for map */
         Rast3d_set_window_map(map, &region);
         /*Set the 2d region appropriate */
         Rast3d_extract2d_region(&region, &region2d);
@@ -261,7 +261,7 @@
                            param.input->answer);
     }
 
-    /*Check if the g3d-region is equal to the 2d rows and cols */
+    /*Check if the g3d-region is equal to the 2D rows and cols */
     rows = Rast_window_rows();
     cols = Rast_window_cols();
 
@@ -379,7 +379,7 @@
 
     /* Close files and exit */
     if (!Rast3d_close(map))
-        fatal_error(map, NULL, 0, _("Error closing 3d raster map"));
+        fatal_error(map, NULL, 0, _("Unable to close 3D raster map"));
 
     map = NULL;