[GRASS-SVN] r65298 - in grass/trunk/display: d.linegraph d.rast.num d.vect

[svn_grass at osgeo.org]

Author: marisn
Date: 2015-05-21 02:25:49 -0700 (Thu, 21 May 2015)
New Revision: 65298

Modified:
   grass/trunk/display/d.linegraph/main.c
   grass/trunk/display/d.rast.num/main.c
   grass/trunk/display/d.vect/area.c
   grass/trunk/display/d.vect/lines.c
   grass/trunk/display/d.vect/main.c
Log:
Rename _n macro to n_ to avoid clashes with other libs (as sugested in dev ML) (some missed files in r65297)

Modified: grass/trunk/display/d.linegraph/main.c
===================================================================
--- grass/trunk/display/d.linegraph/main.c	2015-05-21 09:23:11 UTC (rev 65297)
+++ grass/trunk/display/d.linegraph/main.c	2015-05-21 09:25:49 UTC (rev 65298)
@@ -314,7 +314,7 @@
         }
         
 	    if (in[i].num_pnts > in[0].num_pnts)
-		G_message(_n("The last point will be ignored", 
+		G_message(n_("The last point will be ignored", 
                      "The last %d points will be ignored",
                      (in[i].num_pnts - in[0].num_pnts)),
 			  (in[i].num_pnts - in[0].num_pnts));

Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c	2015-05-21 09:23:11 UTC (rev 65297)
+++ grass/trunk/display/d.rast.num/main.c	2015-05-21 09:25:49 UTC (rev 65298)
@@ -196,8 +196,8 @@
     /* number of rows and cols in window */
 
     if ((nrows > 75) || (ncols > 75)) {
-        G_asprintf(&tmpstr1, _n("%d row", "%d rows", nrows), nrows);
-        G_asprintf(&tmpstr2, _n("%d col", "%d cols", ncols), ncols);
+        G_asprintf(&tmpstr1, n_("%d row", "%d rows", nrows), nrows);
+        G_asprintf(&tmpstr2, n_("%d col", "%d cols", ncols), ncols);
         /* GTC %s will be replaced by strings "X rows" and "Y cols" */
         G_warning(_("Current region size: %s X %s\n"
 		    "Your current region setting may be too large. "

Modified: grass/trunk/display/d.vect/area.c
===================================================================
--- grass/trunk/display/d.vect/area.c	2015-05-21 09:23:11 UTC (rev 65297)
+++ grass/trunk/display/d.vect/area.c	2015-05-21 09:25:49 UTC (rev 65298)
@@ -233,7 +233,7 @@
     }
 
     if ((colors || cvarr_rgb) && get_num_color_rules_skipped() > 0)
-        G_warning(_n("%d invalid color rule for areas skipped", 
+        G_warning(n_("%d invalid color rule for areas skipped", 
                 "%d invalid color rules for areas skipped", 
                 get_num_color_rules_skipped()), 
                 get_num_color_rules_skipped());

Modified: grass/trunk/display/d.vect/lines.c
===================================================================
--- grass/trunk/display/d.vect/lines.c	2015-05-21 09:23:11 UTC (rev 65297)
+++ grass/trunk/display/d.vect/lines.c	2015-05-21 09:25:49 UTC (rev 65298)
@@ -166,21 +166,21 @@
     }
     
     if ((colors || cvarr_rgb) && get_num_color_rules_skipped() > 0)
-        G_warning(_n("%d invalid color rule for lines skipped", 
+        G_warning(n_("%d invalid color rule for lines skipped", 
                 "%d invalid color rules for lines skipped", 
                 get_num_color_rules_skipped()), 
                 get_num_color_rules_skipped());
 
     if (n_points > 0) 
-	G_verbose_message(_n("%d point plotted", "%d points plotted", n_points), n_points);
+	G_verbose_message(n_("%d point plotted", "%d points plotted", n_points), n_points);
     if (n_lines > 0) 
-	G_verbose_message(_n("%d line plotted", "%d lines plotted", n_lines), n_lines);
+	G_verbose_message(n_("%d line plotted", "%d lines plotted", n_lines), n_lines);
     if (n_centroids > 0) 
-	G_verbose_message(_n("%d centroid plotted", "%d centroids plotted", n_centroids), n_centroids);
+	G_verbose_message(n_("%d centroid plotted", "%d centroids plotted", n_centroids), n_centroids);
     if (n_boundaries > 0) 
-	G_verbose_message(_n("%d boundary plotted", "%d boundaries plotted", n_boundaries), n_boundaries);
+	G_verbose_message(n_("%d boundary plotted", "%d boundaries plotted", n_boundaries), n_boundaries);
     if (n_faces > 0) 
-	G_verbose_message(_n("%d face plotted", "%d faces plotted", n_faces), n_faces);
+	G_verbose_message(n_("%d face plotted", "%d faces plotted", n_faces), n_faces);
     
     Vect_destroy_line_struct(Points);
     Vect_destroy_cats_struct(Cats);

Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c	2015-05-21 09:23:11 UTC (rev 65297)
+++ grass/trunk/display/d.vect/main.c	2015-05-21 09:25:49 UTC (rev 65298)
@@ -364,7 +364,7 @@
 	chcat = 1;
 	ret = Vect_str_to_cat_list(cat_opt->answer, Clist);
 	if (ret > 0)
-	    G_warning(_n("%d error in cat option", "%d errors in cat option", ret), ret);
+	    G_warning(n_("%d error in cat option", "%d errors in cat option", ret), ret);
     }
     
     type = Vect_option_to_types(type_opt);