A correction of plural form text strings to use the new ngettext support

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59158 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/gis/get_ellipse.c

@@ -317,9 +317,10 @@ int G_read_ellipsoid_table(int fatal)
     }
 
     (fatal ? G_fatal_error : G_warning)(
-	(err > 1)
-	? _("Lines%s of ellipsoid table file <%s> are invalid")
-	: _("Line%s of ellipsoid table file <%s> is invalid"),
+	_n(
+	("Line%s of ellipsoid table file <%s> is invalid"),
+        ("Lines%s of ellipsoid table file <%s> are invalid"),
+        err), 
 	badlines, file);
 
     G_initialize_done(&table.initialized);

lib/proj/ellipse.c

@@ -269,9 +269,10 @@ struct ellps_list *read_ellipsoid_table(int fatal)
 	return outputlist;
 
     (fatal ? G_fatal_error : G_warning)(
-	err == 1
-	? _("Line%s of ellipsoid table file <%s> is invalid")
-	: _("Lines%s of ellipsoid table file <%s> are invalid"),
+	_n(
+        ("Line%s of ellipsoid table file <%s> is invalid"),
+	("Lines%s of ellipsoid table file <%s> are invalid"),
+        err), 
 	badlines, file);
 
     return outputlist;

lib/vector/Vlib/build_nat.c

@@ -114,8 +114,8 @@ int Vect_build_nat(struct Map_info *Map, int build)
 	}
 	G_progress(1, 1);
 
-	G_message(_("%d primitives registered"), plus->n_lines);
-	G_message(_("%d vertices registered"), npoints);
+	G_message(_n("One primitive registered", "%d primitives registered", plus->n_lines), plus->n_lines);
+	G_message(_n("One vertex registered", "%d vertices registered", npoints), npoints);
 
 	plus->built = GV_BUILD_BASE;
     }
@@ -149,8 +149,8 @@ int Vect_build_nat(struct Map_info *Map, int build)
 		Vect_build_line_area(Map, line, side);
 	    }
 	}
-	G_message(_("%d areas built"), plus->n_areas);
-	G_message(_("%d isles built"), plus->n_isles);
+	G_message(_n("One area built", "%d areas built", plus->n_areas), plus->n_areas);
+	G_message(_n("One isle built", "%d isles built", plus->n_isles), plus->n_isles);
 	plus->built = GV_BUILD_AREAS;
     }
 

lib/vector/Vlib/build_sfa.c

@@ -382,8 +382,8 @@ void build_pg(struct Map_info *Map, int build)
     }
     G_progress(1, 1);
 
-    G_message(_("%d primitives registered"), Map->plus.n_lines);
-    G_message(_("%d vertices registered"), npoints);
+    G_message(_n("One primitive registered", "%d primitives registered", Map->plus.n_lines), Map->plus.n_lines);
+    G_message(_n("One vertex registered", "%d vertices registered", npoints), npoints);
 
     Map->plus.built = GV_BUILD_BASE;
 
@@ -658,12 +658,11 @@ void build_ogr(struct Map_info *Map, int build)
     } /* while */
     G_progress(1, 1);
     
-    G_message(_("%d primitives registered"), Map->plus.n_lines);
-    G_message(_("%d vertices registered"), npoints);
+    G_message(_n("One primitive registered", "%d primitives registered", Map->plus.n_lines), Map->plus.n_lines);
+    G_message(_n("One vertex registered", "%d vertices registered", npoints), npoints);
     
     if (nskipped > 0)
-        G_warning(_("%d %s without geometry skipped"), nskipped,
-                  nskipped == 1 ? "feature" : "features");
+        G_warning(_n("One feature without geometry skipped", "%d features without geometry skipped", nskipped), nskipped);
         
     Map->plus.built = GV_BUILD_BASE;
     

lib/vector/Vlib/cats.c

@@ -602,7 +602,7 @@ struct cat_list *Vect_cats_set_constraint(struct Map_info *Map, int layer,
 	if (ncats == -1)
 		G_fatal_error(_("Unable select records from table <%s>"),
 			      Fi->table);
-	G_verbose_message(_("%d categories loaded"), ncats);
+	G_verbose_message(_n("One category loaded", "%d categories loaded", ncats), ncats);
 	    
 	db_close_database_shutdown_driver(driver);