[GRASS-SVN] r60310 - in grass/branches/releasebranch_7_0: . raster/r.colors

[svn_grass at osgeo.org]

Author: hcho
Date: 2014-05-18 06:03:15 -0700 (Sun, 18 May 2014)
New Revision: 60310

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/raster/r.colors/edit_colors.c
Log:
r.colors: messages (backport r60304)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Added: svn:mergeinfo
   + /grass/trunk:60304

Modified: grass/branches/releasebranch_7_0/raster/r.colors/edit_colors.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.colors/edit_colors.c	2014-05-18 09:41:14 UTC (rev 60309)
+++ grass/branches/releasebranch_7_0/raster/r.colors/edit_colors.c	2014-05-18 13:03:15 UTC (rev 60310)
@@ -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;