Bladeren bron

g.mremove: backport from trunk

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@61042 15284696-431f-4ddb-bdfa-cd5b030d7da7
Huidae Cho 10 jaren geleden
bovenliggende
commit
4ec8fa8719
1 gewijzigde bestanden met toevoegingen van 3 en 9 verwijderingen
  1. 3 9
      general/g.mremove/check_reclass.c

+ 3 - 9
general/g.mremove/check_reclass.c

@@ -1,7 +1,5 @@
 #include <string.h>
-
 #include <grass/gis.h>
-#include <grass/manage.h>
 #include <grass/raster.h>
 #include <grass/glocale.h>
 
@@ -18,8 +16,7 @@ int check_reclass(const char *name, const char *mapset, int force)
 		G_warning(_("Raster map <%s@%s> is a base map for <%s>. Remove forced."),
 			  name, mapset, *rmaps);
 	    else
-		G_warning(_
-			  ("Raster map <%s@%s> is a base map. Remove reclassed map first: %s"),
+		G_warning(_("Raster map <%s@%s> is a base map. Remove reclassed map <%s> first."),
 			  name, mapset, *rmaps);
 	}
 
@@ -41,8 +38,7 @@ int check_reclass(const char *name, const char *mapset, int force)
 	if (nrmaps == 1 && !G_strcasecmp(rmaps[0], qname)) {
 
 	    if (remove(path) < 0)
-		G_warning(_
-			  ("Removing information about reclassed map from [%s@%s] failed"),
+		G_warning(_("Removing information about reclassed map from <%s@%s> failed"),
 			  rname, rmapset);
 	}
 	else {
@@ -55,10 +51,8 @@ int check_reclass(const char *name, const char *mapset, int force)
 		fclose(fp);
 	    }
 	    else
-		G_warning(_
-			  ("Removing information about reclassed map from [%s@%s] failed"),
+		G_warning(_("Removing information about reclassed map from <%s@%s> failed"),
 			  rname, rmapset);
-
 	}
     }