[GRASS-SVN] r47734 - grass/branches/develbranch_6/raster3d/r3.out.v5d

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-08-17 15:24:03 -0700 (Wed, 17 Aug 2011)
New Revision: 47734

Modified:
   grass/branches/develbranch_6/raster3d/r3.out.v5d/main.c
Log:
Milena Nowotarska: i18n cleanup; HTML cleanup

Modified: grass/branches/develbranch_6/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.v5d/main.c	2011-08-17 22:22:37 UTC (rev 47733)
+++ grass/branches/develbranch_6/raster3d/r3.out.v5d/main.c	2011-08-17 22:24:03 UTC (rev 47734)
@@ -51,7 +51,7 @@
     if (map != NULL) {
 	/* should unopen map here! */
 	if (!G3d_closeCell(map))
-	    fatalError("Error closing 3d raster map");
+	    fatalError("Unable to close 3D raster map");
     }
 
     G3d_fatalError(errorMsg);
@@ -69,14 +69,14 @@
     param.input->gisprompt = "old,grid3,3d-raster";
     param.input->multiple = NO;
     param.input->description =
-	_("3d raster map to be converted to Vis5d (v5d) file");
+	_("3D raster map to be converted to Vis5D (V5D) file");
 
     param.output = G_define_option();
     param.output->key = "output";
     param.output->type = TYPE_STRING;
     param.output->gisprompt = "new_file,file,output";
     param.output->required = YES;
-    param.output->description = _("Name for v5d output file");
+    param.output->description = _("Name for V5D output file");
 
     /*  param.null_val = G_define_option();
        param.null_val->key = "null";
@@ -146,10 +146,10 @@
 
     /* see v5d.h */
     if (cols > MAXCOLUMNS)
-	G_fatal_error(_("Viz5D allows %d cols, you have %d cols"), MAXCOLUMNS,
+	G_fatal_error(_("Vis5D allows %d columns, %d columns found"), MAXCOLUMNS,
 		      cols);
     if (rows > MAXROWS)
-	G_fatal_error(_("Viz5D allows %d rows, you have %d rows"), MAXROWS,
+	G_fatal_error(_("Vis5D allows %d rows, %d rows found"), MAXROWS,
 		      rows);
 
     Nl[0] = depths;
@@ -198,9 +198,6 @@
 /****************/
 
     g = (float *)G_malloc(rows * cols * Nl[0] * sizeof(float));
-    if (!g)
-	G_fatal_error(_("Out of memory"));
-
     d1p = &d1;
     f1p = (float *)&d1;
     cnt = 0;
@@ -259,12 +256,12 @@
 	if (!v5dCreate(fileout, NumTimes, NumVars, rows, cols, Nl, VarName,
 		       TimeStamp, DateStamp, CompressMode, Projection,
 		       ProjArgs, Vertical, VertArgs))
-	G_fatal_error(_("Error: couldn't create %s"), fileout);
+	G_fatal_error(_("Unable to create V5D file <%s>"), fileout);
 
 
     /* Write the v5d file */
     if (!v5dWrite(1, 1, g))
-	G_fatal_error(_("Error while writing grid. Disk full?"));
+	G_fatal_error(_("Error writing V5D file"));
 
     /* Close the v5d file */
     v5dClose();
@@ -288,7 +285,7 @@
     module = G_define_module();
     module->keywords = _("raster3d, voxel, export");
     module->description =
-	_("Export of GRASS 3D raster map to 3-dimensional Vis5D file.");
+	_("Exports GRASS 3D raster map to 3-dimensional Vis5D file.");
 
     /* Get parameters from user */
     setParams();
@@ -307,12 +304,12 @@
     trueCoords = coords->answer;
 
     if (NULL == G_find_grid3(input, ""))
-	G3d_fatalError(_("Requested 3d raster map not found"));
+	G3d_fatalError(_("3D raster map <%s> not found"), input);
 
     map = G3d_openCellOld(input, G_find_grid3(input, ""), G3D_DEFAULT_WINDOW,
 			  G3D_TILE_SAME_AS_FILE, G3D_NO_CACHE);
     if (map == NULL)
-	G3d_fatalError(_("Error opening 3d raster map"));
+	G3d_fatalError(_("Unable to open 3D raster map <%s>"), input);
 
     /* Use default region */
     /*  G3d_getRegionStructMap(map, &region); */
@@ -326,7 +323,7 @@
 
     /* Close files and exit */
     if (!G3d_closeCell(map))
-	fatalError(_("Error closing 3d raster map"));
+	fatalError(_("Unable to close 3D raster map"));
 
     map = NULL;
     return (0);