[GRASS-SVN] r29525 - in grass/trunk/raster: r.cats r.out.ascii
r.recode r.stats r.support.stats
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 27 12:51:37 EST 2007
Author: cdavilam
Date: 2007-12-27 12:51:37 -0500 (Thu, 27 Dec 2007)
New Revision: 29525
Modified:
grass/trunk/raster/r.cats/main.c
grass/trunk/raster/r.out.ascii/main.c
grass/trunk/raster/r.recode/read_rules.c
grass/trunk/raster/r.stats/main.c
grass/trunk/raster/r.support.stats/main.c
Log:
Message standardization
Modified: grass/trunk/raster/r.cats/main.c
===================================================================
--- grass/trunk/raster/r.cats/main.c 2007-12-27 17:28:12 UTC (rev 29524)
+++ grass/trunk/raster/r.cats/main.c 2007-12-27 17:51:37 UTC (rev 29525)
@@ -167,7 +167,7 @@
else {
fp = fopen(parm.file->answer, "r");
if (!fp)
- G_fatal_error(_("Unable to open file: <%s>"), parm.file->answer);
+ G_fatal_error(_("Unable to open file <%s>"), parm.file->answer);
}
G_init_raster_cats("", &cats);
Modified: grass/trunk/raster/r.out.ascii/main.c
===================================================================
--- grass/trunk/raster/r.out.ascii/main.c 2007-12-27 17:28:12 UTC (rev 29524)
+++ grass/trunk/raster/r.out.ascii/main.c 2007-12-27 17:51:37 UTC (rev 29525)
@@ -118,36 +118,36 @@
if(parm.dp->answer)
{
if(sscanf(parm.dp->answer,"%d",&dp)!=1)
- G_fatal_error("failed to interpret dp as an integer");
+ G_fatal_error(_("Failed to interpret dp as an integer"));
if(dp>20 || dp < 0)
- G_fatal_error("dp has to be from 0 to 20");
+ G_fatal_error(_("dp has to be from 0 to 20"));
}
width=10;
if(parm.width->answer)
{
if(sscanf(parm.width->answer,"%d",&width)!=1)
- G_fatal_error("failed to interpret width as an integer");
+ G_fatal_error(_("Failed to interpret width as an integer"));
}
null_str = parm.null->answer;
if (flag.surfer->answer && flag.noheader->answer)
- G_fatal_error("Both -s and -h doesn't make sense.");
+ G_fatal_error(_("Both -s and -h doesn't make sense"));
if (flag.surfer->answer && flag.modflow->answer)
- G_fatal_error("Use -M or -s, not both.");
+ G_fatal_error(_("Use -M or -s, not both"));
name = parm.map->answer;
mapset = G_find_cell2(name, "");
if (!mapset)
- G_fatal_error ("Cell file [%s] not found",name);
+ G_fatal_error (_("Raster map <%s> not found"),name);
/* open raster map */
fd = G_open_cell_old (name, mapset);
if (fd < 0)
- G_fatal_error("Unable to open input map");
+ G_fatal_error(_("Unable to open raster map <%s>"), name);
map_type = G_get_raster_map_type(fd);
@@ -170,7 +170,7 @@
if(parm.output->answer && strcmp("-",parm.output->answer)!=0)
{
if(NULL == (fp = fopen(parm.output->answer, "w")))
- G_fatal_error("Not able to open file [%s]", parm.output->answer);
+ G_fatal_error(_("Unable to open file <%s>"), parm.output->answer);
}
else
fp = stdout;
@@ -181,7 +181,7 @@
if(!flag.noheader->answer)
{
if(writeGSheader(fp,name,mapset))
- G_fatal_error ("Can't read fp range for [%s]",name);
+ G_fatal_error (_("Unable to read fp range for <%s>"),name);
}
rc=write_GSGRID(fd,fp,nrows,ncols,out_type,dp,surfer_null_str,width);
}
@@ -197,7 +197,7 @@
}
if(rc)
{
- G_fatal_error("Read failed at row [%d]",rc);
+ G_fatal_error(_("Read failed at row %d"),rc);
}
/* tidy up and go away */
Modified: grass/trunk/raster/r.recode/read_rules.c
===================================================================
--- grass/trunk/raster/r.recode/read_rules.c 2007-12-27 17:28:12 UTC (rev 29524)
+++ grass/trunk/raster/r.recode/read_rules.c 2007-12-27 17:51:37 UTC (rev 29525)
@@ -32,7 +32,7 @@
}
}
if(G_read_range(name, mapset, &range)<=0)
- G_fatal_error(_("Unable to read range for map %s"), name);
+ G_fatal_error(_("Unable to read range for map <%s>"), name);
G_get_range_min_max(&range, &old_min, &old_max);
if(G_is_c_null_value(&old_min) || G_is_c_null_value(&old_max))
Modified: grass/trunk/raster/r.stats/main.c
===================================================================
--- grass/trunk/raster/r.stats/main.c 2007-12-27 17:28:12 UTC (rev 29524)
+++ grass/trunk/raster/r.stats/main.c 2007-12-27 17:51:37 UTC (rev 29525)
@@ -250,7 +250,7 @@
/* open all raster maps */
if( option.cell->answers[0] == NULL )
- G_fatal_error(_("Raster map not found."));
+ G_fatal_error(_("Raster map not found"));
names = option.cell->answers;
ptr = option.cell->answers;
@@ -260,7 +260,7 @@
name = *ptr;
mapset = G_find_cell2 (name, "");
if (!mapset)
- G_fatal_error (_("%s: [%s] not found"), G_program_name(), name);
+ G_fatal_error (_("Raster map <%s> not found"), name);
fd = (int *) G_realloc (fd, (nfiles+1) * sizeof(int));
is_fp = (int *) G_realloc (is_fp, (nfiles+1) * sizeof(int));
DMAX = (DCELL *) G_realloc (DMAX, (nfiles+1) * sizeof(DCELL));
@@ -319,7 +319,7 @@
else
{
if(G_read_range (name, mapset, &range) < 0)
- G_fatal_error (_("%s: can't read range for [%s]"),G_program_name(),name);
+ G_fatal_error (_("Unable to read range for map <%s>"),name);
G_get_range_min_max (&range, &min, &max);
}
if(!null_set)
Modified: grass/trunk/raster/r.support.stats/main.c
===================================================================
--- grass/trunk/raster/r.support.stats/main.c 2007-12-27 17:28:12 UTC (rev 29524)
+++ grass/trunk/raster/r.support.stats/main.c 2007-12-27 17:51:37 UTC (rev 29525)
@@ -44,11 +44,11 @@
mapset = G_find_cell2(parm.raster->answer, G_mapset());
if (mapset == NULL)
- G_fatal_error(_("Raster file [%s] not found"), parm.raster->answer);
+ G_fatal_error(_("Raster map <%s> not found"), parm.raster->answer);
check_stats(parm.raster->answer, mapset);
- G_message(_("Statistics for [%s] updated"), parm.raster->answer);
+ G_message(_("Statistics for <%s> updated"), parm.raster->answer);
return EXIT_SUCCESS;
}
More information about the grass-commit
mailing list