[GRASS-SVN] r29679 - in grass/trunk: imagery/i.cluster lib/gis lib/vector/Vlib raster/r.out.mpeg vector/v.clean

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-01-12 13:45:21 -0500 (Sat, 12 Jan 2008)
New Revision: 29679

Modified:
   grass/trunk/imagery/i.cluster/open_files.c
   grass/trunk/lib/gis/gisinit.c
   grass/trunk/lib/vector/Vlib/build_nat.c
   grass/trunk/raster/r.out.mpeg/main.c
   grass/trunk/vector/v.clean/prune.c
   grass/trunk/vector/v.clean/rmdac.c
Log:
Do not use \r in _() macro, suppress xgettext warnings

Modified: grass/trunk/imagery/i.cluster/open_files.c
===================================================================
--- grass/trunk/imagery/i.cluster/open_files.c	2008-01-12 16:49:04 UTC (rev 29678)
+++ grass/trunk/imagery/i.cluster/open_files.c	2008-01-12 18:45:21 UTC (rev 29679)
@@ -31,11 +31,9 @@
 	mapset = ref.file[n].mapset;
 	if (G_find_cell (name, mapset) == NULL)
 	{
-	    if (!missing)
-		G_warning(_("\7\n** The following raster maps in "
-                          "subgroup [%s] do not exist:"), subgroup);
 	    missing = 1;
-	    G_message(_("       %s"), G_fully_qualified_name(name, mapset));
+	    G_warning(_("Raster map <%s> do not exists in subgroup <%s>"),
+		      G_fully_qualified_name(name, mapset), subgroup);
 	}
     }
     if (missing) exit(1);

Modified: grass/trunk/lib/gis/gisinit.c
===================================================================
--- grass/trunk/lib/gis/gisinit.c	2008-01-12 16:49:04 UTC (rev 29678)
+++ grass/trunk/lib/gis/gisinit.c	2008-01-12 18:45:21 UTC (rev 29679)
@@ -98,7 +98,7 @@
 int G__check_gisinit(void)
 {
     if (initialized) return 1;
-    fprintf (stderr, _("\7ERROR: System not initialized. Programmer forgot to call G_gisinit()\n"));
+    G_warning (_("System not initialized. Programmer forgot to call G_gisinit()."));
     G_sleep(3);
     exit(EXIT_FAILURE);
 }

Modified: grass/trunk/lib/vector/Vlib/build_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/build_nat.c	2008-01-12 16:49:04 UTC (rev 29678)
+++ grass/trunk/lib/vector/Vlib/build_nat.c	2008-01-12 18:45:21 UTC (rev 29679)
@@ -504,7 +504,7 @@
 	    }
 	    i++; j++;
 	}
-	prnmsg (_("\r%d primitives registered      \n"), plus->n_lines);
+	prnmsg ("\r%d %s      \n", plus->n_lines, _("primitives registered"));
 
 	plus->built = GV_BUILD_BASE;
     }
@@ -531,7 +531,7 @@
 		Vect_build_line_area ( Map, i, side );
 	    }
 	}
-	prnmsg (_("\r%d areas built      \n%d isles built\n"), plus->n_areas, plus->n_isles );
+	prnmsg ("\r%d %s      \n%d %s\n", plus->n_areas, _("areas built"), plus->n_isles, _("isles built"));
 	plus->built = GV_BUILD_AREAS;
     }
     

Modified: grass/trunk/raster/r.out.mpeg/main.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/main.c	2008-01-12 16:49:04 UTC (rev 29678)
+++ grass/trunk/raster/r.out.mpeg/main.c	2008-01-12 18:45:21 UTC (rev 29679)
@@ -215,7 +215,7 @@
 
 	    strcpy(name, vfiles[vnum][cnt]);
 	    if (!quiet)
-		G_message(_("\rReading file '%s'"), name);
+		G_message("\r%s <%s>", _("Reading file"), name);
 
 	    mapset = G_find_cell2 (name, "");
 	    if (mapset == NULL)

Modified: grass/trunk/vector/v.clean/prune.c
===================================================================
--- grass/trunk/vector/v.clean/prune.c	2008-01-12 16:49:04 UTC (rev 29678)
+++ grass/trunk/vector/v.clean/prune.c	2008-01-12 18:45:21 UTC (rev 29679)
@@ -190,7 +190,7 @@
 	    }
 		
 	    if (G_verbose() > G_verbose_min()) 
-	      fprintf (stderr, _("\rRemoved vertices: %5d"), nremoved);
+	      fprintf (stderr, "\r%s: %5d", _("Removed vertices"), nremoved);
 	    
 	    fflush ( stderr );
 	}

Modified: grass/trunk/vector/v.clean/rmdac.c
===================================================================
--- grass/trunk/vector/v.clean/rmdac.c	2008-01-12 16:49:04 UTC (rev 29678)
+++ grass/trunk/vector/v.clean/rmdac.c	2008-01-12 18:45:21 UTC (rev 29679)
@@ -52,7 +52,7 @@
 		ndupl++;
 
 		if (G_verbose() > G_verbose_min())
-		  fprintf (stderr, _("\rDuplicate area centroids: %5d"), ndupl);
+		  fprintf (stderr, "\r%s: %5d", _("Duplicate area centroids"), ndupl);
 
 		if (Err) {
 		    Vect_write_line(Err, type, Points, Cats);