[GRASS-SVN] r60304 - grass/trunk/raster/r.colors

svn_grass at osgeo.org svn_grass at osgeo.org
Sat May 17 22:48:44 PDT 2014


Author: hcho
Date: 2014-05-17 22:48:43 -0700 (Sat, 17 May 2014)
New Revision: 60304

Modified:
   grass/trunk/raster/r.colors/edit_colors.c
Log:
r.colors: error message cosmetics

Modified: grass/trunk/raster/r.colors/edit_colors.c
===================================================================
--- grass/trunk/raster/r.colors/edit_colors.c	2014-05-18 05:48:32 UTC (rev 60303)
+++ grass/trunk/raster/r.colors/edit_colors.c	2014-05-18 05:48:43 UTC (rev 60304)
@@ -162,15 +162,15 @@
     file = opt.file->answer;
 
     if (opt.maps->answer && opt.file->answer)
-        G_fatal_error(_("Options <%s> and <%s> options are mutually exclusive"),
+        G_fatal_error(_("Options <%s> and <%s> are mutually exclusive"),
 		      opt.maps->key, opt.file->key);
 
     if (!opt.maps->answer && !opt.file->answer)
-        G_fatal_error(_("Options <%s> or <%s> must be specified"),
+        G_fatal_error(_("Option <%s> or <%s> must be specified"),
 		      opt.maps->key, opt.file->key);
 
     if (opt.rast->answer && opt.volume->answer)
-        G_fatal_error(_("Options <%s> and <%s> options are mutually exclusive"),
+        G_fatal_error(_("Options <%s> and <%s> are mutually exclusive"),
 		      opt.rast->key, opt.volume->key);
 
     if (opt.rast->answer)
@@ -184,12 +184,12 @@
 			opt.rast->key, opt.rules->key);
     
     if (!!style + !!cmap + !!rules > 1)
-        G_fatal_error(_("Options <%s>, <%s>, and <%s> options are mutually "
+        G_fatal_error(_("Options <%s>, <%s>, and <%s> are mutually "
 			"exclusive"), opt.colr->key, opt.rules->key,
 		      opt.rast->key);
     
     if (flag.g->answer && flag.a->answer)
-        G_fatal_error(_("Flags -%c and -%c flags are mutually exclusive"),
+        G_fatal_error(_("Flags -%c and -%c are mutually exclusive"),
 		      flag.g->key, flag.a->key);
 
     is_from_stdin = rules && strcmp(rules, "-") == 0;



More information about the grass-commit mailing list