[GRASS-SVN] r65313 - in grass/branches/releasebranch_7_0: display/d.linegraph display/d.rast.num display/d.vect include lib/gis lib/proj lib/vector/Vlib locale raster/r.clump raster/r.contour raster/r.cost raster/r.fill.dir raster/r.out.ppm raster/r.out.ppm3 raster/r.resamp.bspline raster/r.resamp.rst raster/r.sim/simlib raster/r.stream.extract raster/r.surf.idw raster/r.texture raster/r.thin raster/r.watershed/ram raster/r.watershed/seg vector/v.build.polylines vector/v.category vector/v.edit vector/v.external vector/v.extract vector/v.in.ascii vector/v.in.db vector/v.kernel vector/v.lidar.correction vector/v.lrs/v.lrs.segment vector/v.lrs/v.lrs.where vector/v.net.distance vector/v.out.ascii vector/v.out.ogr vector/v.out.postgis vector/v.out.pov vector/v.overlay vector/v.sample vector/v.segment vector/v.surf.idw vector/v.voronoi vector/v.what.rast3
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun May 24 05:32:46 PDT 2015
Author: neteler
Date: 2015-05-24 05:32:46 -0700 (Sun, 24 May 2015)
New Revision: 65313
Modified:
grass/branches/releasebranch_7_0/display/d.linegraph/main.c
grass/branches/releasebranch_7_0/display/d.rast.num/main.c
grass/branches/releasebranch_7_0/display/d.vect/area.c
grass/branches/releasebranch_7_0/display/d.vect/lines.c
grass/branches/releasebranch_7_0/display/d.vect/main.c
grass/branches/releasebranch_7_0/include/glocale.h
grass/branches/releasebranch_7_0/lib/gis/get_ellipse.c
grass/branches/releasebranch_7_0/lib/proj/ellipse.c
grass/branches/releasebranch_7_0/lib/vector/Vlib/build_nat.c
grass/branches/releasebranch_7_0/lib/vector/Vlib/build_sfa.c
grass/branches/releasebranch_7_0/lib/vector/Vlib/cats.c
grass/branches/releasebranch_7_0/locale/Makefile
grass/branches/releasebranch_7_0/locale/README
grass/branches/releasebranch_7_0/raster/r.clump/main.c
grass/branches/releasebranch_7_0/raster/r.contour/cont.c
grass/branches/releasebranch_7_0/raster/r.cost/main.c
grass/branches/releasebranch_7_0/raster/r.fill.dir/dopolys.c
grass/branches/releasebranch_7_0/raster/r.out.ppm/main.c
grass/branches/releasebranch_7_0/raster/r.out.ppm3/main.c
grass/branches/releasebranch_7_0/raster/r.resamp.bspline/crosscorr.c
grass/branches/releasebranch_7_0/raster/r.resamp.rst/main.c
grass/branches/releasebranch_7_0/raster/r.sim/simlib/input.c
grass/branches/releasebranch_7_0/raster/r.stream.extract/del_streams.c
grass/branches/releasebranch_7_0/raster/r.surf.idw/main.c
grass/branches/releasebranch_7_0/raster/r.texture/main.c
grass/branches/releasebranch_7_0/raster/r.thin/io.c
grass/branches/releasebranch_7_0/raster/r.thin/thin_lines.c
grass/branches/releasebranch_7_0/raster/r.watershed/ram/do_cum.c
grass/branches/releasebranch_7_0/raster/r.watershed/seg/init_vars.c
grass/branches/releasebranch_7_0/vector/v.build.polylines/main.c
grass/branches/releasebranch_7_0/vector/v.category/main.c
grass/branches/releasebranch_7_0/vector/v.edit/main.c
grass/branches/releasebranch_7_0/vector/v.edit/select.c
grass/branches/releasebranch_7_0/vector/v.external/list.c
grass/branches/releasebranch_7_0/vector/v.extract/main.c
grass/branches/releasebranch_7_0/vector/v.in.ascii/points.c
grass/branches/releasebranch_7_0/vector/v.in.db/main.c
grass/branches/releasebranch_7_0/vector/v.kernel/main.c
grass/branches/releasebranch_7_0/vector/v.lidar.correction/main.c
grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.segment/main.c
grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.where/main.c
grass/branches/releasebranch_7_0/vector/v.net.distance/main.c
grass/branches/releasebranch_7_0/vector/v.out.ascii/main.c
grass/branches/releasebranch_7_0/vector/v.out.ogr/main.c
grass/branches/releasebranch_7_0/vector/v.out.postgis/main.c
grass/branches/releasebranch_7_0/vector/v.out.pov/main.c
grass/branches/releasebranch_7_0/vector/v.overlay/area_area.c
grass/branches/releasebranch_7_0/vector/v.sample/main.c
grass/branches/releasebranch_7_0/vector/v.segment/main.c
grass/branches/releasebranch_7_0/vector/v.surf.idw/main.c
grass/branches/releasebranch_7_0/vector/v.surf.idw/read_sites.c
grass/branches/releasebranch_7_0/vector/v.voronoi/main.c
grass/branches/releasebranch_7_0/vector/v.voronoi/sw_main.c
grass/branches/releasebranch_7_0/vector/v.what.rast3/main.c
Log:
Rename _n macro to n_ to avoid clashes with other libs (as sugested in dev ML) (trunk, r65297 and r65298)
Modified: grass/branches/releasebranch_7_0/display/d.linegraph/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.linegraph/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/display/d.linegraph/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -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/branches/releasebranch_7_0/display/d.rast.num/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rast.num/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/display/d.rast.num/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -173,8 +173,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/branches/releasebranch_7_0/display/d.vect/area.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect/area.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/display/d.vect/area.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -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/branches/releasebranch_7_0/display/d.vect/lines.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect/lines.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/display/d.vect/lines.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -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/branches/releasebranch_7_0/display/d.vect/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/display/d.vect/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -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);
Modified: grass/branches/releasebranch_7_0/include/glocale.h
===================================================================
--- grass/branches/releasebranch_7_0/include/glocale.h 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/include/glocale.h 2015-05-24 12:32:46 UTC (rev 65313)
@@ -8,10 +8,10 @@
#if defined(HAVE_LIBINTL_H) && defined(USE_NLS)
#include <libintl.h>
#define _(str) G_gettext(PACKAGE,(str))
-#define _n(strs,strp,num) G_ngettext(PACKAGE,(strs),(strp),num)
+#define n_(strs,strp,num) G_ngettext(PACKAGE,(strs),(strp),num)
#else
#define _(str) (str)
-#define _n(strs,strp,num) ((num == 1) ? (strs) : (strp))
+#define n_(strs,strp,num) ((num == 1) ? (strs) : (strp))
#endif
#endif
Modified: grass/branches/releasebranch_7_0/lib/gis/get_ellipse.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/get_ellipse.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/lib/gis/get_ellipse.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -317,7 +317,7 @@
}
(fatal ? G_fatal_error : G_warning)(
- _n(
+ n_(
("Line%s of ellipsoid table file <%s> is invalid"),
("Lines%s of ellipsoid table file <%s> are invalid"),
err),
Modified: grass/branches/releasebranch_7_0/lib/proj/ellipse.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/proj/ellipse.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/lib/proj/ellipse.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -269,7 +269,7 @@
return outputlist;
(fatal ? G_fatal_error : G_warning)(
- _n(
+ n_(
("Line%s of ellipsoid table file <%s> is invalid"),
("Lines%s of ellipsoid table file <%s> are invalid"),
err),
Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/build_nat.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/build_nat.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/build_nat.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -114,8 +114,8 @@
}
G_progress(1, 1);
- 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);
+ 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;
}
@@ -150,8 +150,8 @@
Vect_build_line_area(Map, line, side);
}
}
- 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);
+ 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;
}
Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/build_sfa.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/build_sfa.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/build_sfa.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -382,8 +382,8 @@
}
G_progress(1, 1);
- 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);
+ 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,11 +658,11 @@
} /* while */
G_progress(1, 1);
- 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);
+ 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(_n("One feature without geometry skipped", "%d features without geometry skipped", nskipped), nskipped);
+ G_warning(n_("One feature without geometry skipped", "%d features without geometry skipped", nskipped), nskipped);
Map->plus.built = GV_BUILD_BASE;
Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/cats.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/cats.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/cats.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -602,7 +602,7 @@
if (ncats == -1)
G_fatal_error(_("Unable select records from table <%s>"),
Fi->table);
- G_verbose_message(_n("One category loaded", "%d categories loaded", ncats), ncats);
+ G_verbose_message(n_("One category loaded", "%d categories loaded", ncats), ncats);
db_close_database_shutdown_driver(driver);
Modified: grass/branches/releasebranch_7_0/locale/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/locale/Makefile 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/locale/Makefile 2015-05-24 12:32:46 UTC (rev 65313)
@@ -31,9 +31,9 @@
WXPYDOMAIN = grasswxpy
DOMAINS = $(LIBDOMAIN) $(MODDOMAIN) $(WXPYDOMAIN)
-LIB_POTFILES = find ../lib \( -name "*.c" -o -name "*.py" \) | xargs grep -l "_(\"\|_n(\""
-MOD_POTFILES = find ../ -name '*.c' | grep -v '../lib' | xargs grep -l "_(\"\|_n(\""
-WXPY_POTFILES = find ../gui/wxpython -name '*.py' | xargs grep -l "_(\"\|_n(\""
+LIB_POTFILES = find ../lib \( -name "*.c" -o -name "*.py" \) | xargs grep -l "_(\"\|n_(\""
+MOD_POTFILES = find ../ -name '*.c' | grep -v '../lib' | xargs grep -l "_(\"\|n_(\""
+WXPY_POTFILES = find ../gui/wxpython -name '*.py' | xargs grep -l "_(\"\|n_(\""
define po_stats
GISBASE="$(RUN_GISBASE)" $(PYTHON) ./grass_po_stats.py
@@ -48,11 +48,11 @@
fi
@rm -f ./templates/*.pot
@echo "Generating $(LIBDOMAIN)..."
- xgettext --keyword=_ --keyword=_n:1,2 -cGTC -o ./templates/$(LIBDOMAIN).pot `$(LIB_POTFILES)`
+ xgettext --keyword=_ --keyword=n_:1,2 -cGTC -o ./templates/$(LIBDOMAIN).pot `$(LIB_POTFILES)`
@echo "Generating $(MODDOMAIN)..."
- xgettext --keyword=_ --keyword=_n:1,2 -cGTC -o ./templates/$(MODDOMAIN).pot `$(MOD_POTFILES)`
+ xgettext --keyword=_ --keyword=n_:1,2 -cGTC -o ./templates/$(MODDOMAIN).pot `$(MOD_POTFILES)`
@echo "Generating $(WXPYDOMAIN)..."
- xgettext --keyword=_ --keyword=_n:1,2 -cGTC -o ./templates/$(WXPYDOMAIN).pot `$(WXPY_POTFILES)`
+ xgettext --keyword=_ --keyword=n_:1,2 -cGTC -o ./templates/$(WXPYDOMAIN).pot `$(WXPY_POTFILES)`
#merge already existing translations with new messages in POT template file and create new po files:
update-po:
Modified: grass/branches/releasebranch_7_0/locale/README
===================================================================
--- grass/branches/releasebranch_7_0/locale/README 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/locale/README 2015-05-24 12:32:46 UTC (rev 65313)
@@ -61,8 +61,8 @@
NOTE4: Any string containing a number that requires a correct plural form of
a noun, has to pass trough ngettext function implemented in GRASS
- as a _n() macro.
- _n("Message in English for singular case", "Message in English for
+ as a n_() macro.
+ n_("Message in English for singular case", "Message in English for
plural case", number)
Examples of messages with plural forms.
@@ -75,20 +75,20 @@
G_message( n == 1 ? _("Remove map") : _("Remove maps"));
Correct:
- G_message( _n("%d map from mapset <%s> removed",
+ G_message( n_("%d map from mapset <%s> removed",
"%d maps from mapset <%s> removed", n), n, ms);
/* Notice double use of number "n" - as an argument for
- both functions - _n() and G_message() */
- G_message( _n("One file removed", "%d files removed", n) n);
+ both functions - n_() and G_message() */
+ G_message( n_("One file removed", "%d files removed", n) n);
/* Both of forms of singular case "%d file" or "One file" are correct.
The choice between them is purely stylistic one. */
- G_warning( _n("One feature without geometry skipped",
+ G_warning( n_("One feature without geometry skipped",
"%d features without geometry skipped", n), n);
- G_message( _n("%d map selected", "%d maps selected", n), n);
+ G_message( n_("%d map selected", "%d maps selected", n), n);
/* Altough in English it is not necessary to provide a separate
text if "n" always is >1, in other languages is a difference if "n"
is i.e. 2-4, or n==10 etc. */
- G_message( _n("Remove map", "Remove maps", n));
+ G_message( n_("Remove map", "Remove maps", n));
/* Number it self doesn't have to be used in the output text */
Modified: grass/branches/releasebranch_7_0/raster/r.clump/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.clump/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.clump/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -119,7 +119,7 @@
Rast_write_history(OUTPUT, &hist);
n_clumps = range_return == 2 ? 0 : range.max;
- G_done_msg(_n("%d clump.", "%d clumps.", n_clumps), n_clumps);
+ G_done_msg(n_("%d clump.", "%d clumps.", n_clumps), n_clumps);
}
exit(EXIT_SUCCESS);
Modified: grass/branches/releasebranch_7_0/raster/r.contour/cont.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.contour/cont.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.contour/cont.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -79,7 +79,7 @@
ncrossing = 0;
- G_message(_n("Writing vector contour (one level)...",
+ G_message(n_("Writing vector contour (one level)...",
"Writing vector contours (total levels %d)...", nlevels), nlevels);
for (n = 0; n < nlevels; n++) {
@@ -210,7 +210,7 @@
} /* for levels */
if (ncrossing > 0) {
- G_warning(_n("%d crossing found",
+ G_warning(n_("%d crossing found",
"%d crossings found",
ncrossing), ncrossing);
}
Modified: grass/branches/releasebranch_7_0/raster/r.cost/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.cost/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.cost/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -581,7 +581,7 @@
if (npoints < 1)
G_fatal_error(_("No start points found in vector map <%s>"), Vect_get_full_name(&In));
else
- G_verbose_message(_n("%d point found", "%d points found", npoints), npoints);
+ G_verbose_message(n_("%d point found", "%d points found", npoints), npoints);
Vect_close(&In);
}
Modified: grass/branches/releasebranch_7_0/raster/r.fill.dir/dopolys.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.fill.dir/dopolys.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.fill.dir/dopolys.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -81,7 +81,7 @@
recurse_list(flag, cells, found, i);
}
}
- G_message(_n("Found %d unresolved area",
+ G_message(n_("Found %d unresolved area",
"Found %d unresolved areas", flag), flag);
/* Compose a new raster map to contain the resulting assignments */
Modified: grass/branches/releasebranch_7_0/raster/r.out.ppm/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.ppm/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.out.ppm/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -98,8 +98,8 @@
/*G_get_set_window (&w); *//* 10/99 MN: check for current region */
G_get_window(&w);
- G_asprintf(&tmpstr1, _n("row = %d", "rows = %d", w.rows), w.rows);
- G_asprintf(&tmpstr2, _n("column = %d", "columns = %d", w.cols), w.cols);
+ G_asprintf(&tmpstr1, n_("row = %d", "rows = %d", w.rows), w.rows);
+ G_asprintf(&tmpstr2, n_("column = %d", "columns = %d", w.cols), w.cols);
G_message("%s, %s", tmpstr1, tmpstr2);
G_free(tmpstr1);
G_free(tmpstr2);
Modified: grass/branches/releasebranch_7_0/raster/r.out.ppm3/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.ppm3/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.out.ppm3/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -92,9 +92,9 @@
G_get_window(&w);
- G_asprintf(&tmpstr1, _n("row = %d", "rows = %d", w.rows), w.rows);
+ G_asprintf(&tmpstr1, n_("row = %d", "rows = %d", w.rows), w.rows);
/* GTC Raster columns */
- G_asprintf(&tmpstr2, _n("column = %d", "columns = %d", w.cols), w.cols);
+ G_asprintf(&tmpstr2, n_("column = %d", "columns = %d", w.cols), w.cols);
G_message("%s, %s", tmpstr1, tmpstr2);
G_free(tmpstr1);
G_free(tmpstr2);
Modified: grass/branches/releasebranch_7_0/raster/r.resamp.bspline/crosscorr.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.resamp.bspline/crosscorr.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.resamp.bspline/crosscorr.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -166,7 +166,7 @@
/* Current region is read and points recorded into observ */
observ = P_Read_Raster_Region_Map(in_seg, ®ion, src_reg, &ndata, 1024);
G_debug(5, "CrossCorrelation: %d points read in region. ", ndata);
- G_verbose_message(_n("%d point read in region",
+ G_verbose_message(n_("%d point read in region",
"%d points read in region", ndata),
ndata);
Modified: grass/branches/releasebranch_7_0/raster/r.resamp.rst/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.resamp.rst/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.resamp.rst/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -397,7 +397,7 @@
G_message(_("%.2f KB of disk space for temp files."), sdisk / 1024.);
}
else
- G_message(_n("%d byte of disk space for temp files.",
+ G_message(n_("%d byte of disk space for temp files.",
"%d bytes of disk space for temp files.", (int)sdisk), (int)sdisk);
Modified: grass/branches/releasebranch_7_0/raster/r.sim/simlib/input.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.sim/simlib/input.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.sim/simlib/input.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -252,7 +252,7 @@
deltap = amin1(deltap, deltaw);
- G_message(_n("Number of iterations \t= %d cell\n",
+ G_message(n_("Number of iterations \t= %d cell\n",
"Number of iterations \t= %d cells\n", miter), miter);
G_message(_("Time step \t= %.2f s\n"), deltap);
if (wdepth) {
Modified: grass/branches/releasebranch_7_0/raster/r.stream.extract/del_streams.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.stream.extract/del_streams.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.stream.extract/del_streams.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -127,7 +127,7 @@
int other_trib, tmp_trib;
int slength;
- G_message(_n("Deleting stream segments shorter than %d cell...",
+ G_message(n_("Deleting stream segments shorter than %d cell...",
"Deleting stream segments shorter than %d cells...", min_length),
min_length);
@@ -190,7 +190,7 @@
}
}
- G_verbose_message(_n("%d stream segment deleted",
+ G_verbose_message(n_("%d stream segment deleted",
"%d stream segments deleted", n_deleted), n_deleted);
return n_deleted;
Modified: grass/branches/releasebranch_7_0/raster/r.surf.idw/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.surf.idw/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.surf.idw/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -257,7 +257,7 @@
nbr_head->searchptr = &(nbr_head->Mptr); /* see replace_neighbor */
#endif
- G_message(_n("Interpolating raster map <%s> (%d row)...",
+ G_message(n_("Interpolating raster map <%s> (%d row)...",
"Interpolating raster map <%s> (%d rows)...", nrows),
output, nrows);
Modified: grass/branches/releasebranch_7_0/raster/r.texture/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.texture/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.texture/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -324,7 +324,7 @@
}
}
if (n_measures > 1)
- G_message(_n("Calculating %d texture measure",
+ G_message(n_("Calculating %d texture measure",
"Calculating %d texture measures", n_measures), n_measures);
else
G_message(_("Calculating %s"), menu[measure_idx[0]].desc);
Modified: grass/branches/releasebranch_7_0/raster/r.thin/io.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.thin/io.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.thin/io.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -99,9 +99,9 @@
n_cols = Rast_window_cols();
/* GTC Count of raster rows */
- G_asprintf(&tmpstr1, _n("%d row", "%d rows", n_rows), n_rows);
+ G_asprintf(&tmpstr1, n_("%d row", "%d rows", n_rows), n_rows);
/* GTC Count of raster columns */
- G_asprintf(&tmpstr2, _n("%d column", "%d columns", n_cols), n_cols);
+ G_asprintf(&tmpstr2, n_("%d column", "%d columns", n_cols), n_cols);
/* GTC First argument is the raster map name, second and third - a string representing number of rows and cols */
G_message(_("Raster map <%s> - %s X %s"), name, tmpstr1, tmpstr2);
G_free(tmpstr1);
@@ -166,18 +166,18 @@
col_count = n_cols - (PAD << 1);
/* GTC Count of raster rows */
- G_asprintf(&tmpstr1, _n("%d row", "%d rows", row_count), row_count);
+ G_asprintf(&tmpstr1, n_("%d row", "%d rows", row_count), row_count);
/* GTC Count of raster columns */
- G_asprintf(&tmpstr2, _n("%d column", "%d columns", col_count), col_count);
+ G_asprintf(&tmpstr2, n_("%d column", "%d columns", col_count), col_count);
/* GTC %s will be replaced with number of rows and columns */
G_message(_("Output map %s X %s"), tmpstr1, tmpstr2);
G_free(tmpstr1);
G_free(tmpstr2);
/* GTC Count of window rows */
- G_asprintf(&tmpstr1, _n("%d row", "%d rows", Rast_window_rows()), Rast_window_rows());
+ G_asprintf(&tmpstr1, n_("%d row", "%d rows", Rast_window_rows()), Rast_window_rows());
/* GTC Count of window columns */
- G_asprintf(&tmpstr2, _n("%d column", "%d columns", Rast_window_cols()), Rast_window_cols());
+ G_asprintf(&tmpstr2, n_("%d column", "%d columns", Rast_window_cols()), Rast_window_cols());
/* GTC %s will be replaced with number of rows and columns */
G_message(_("Window %s X %s"), tmpstr1, tmpstr2);
G_free(tmpstr1);
Modified: grass/branches/releasebranch_7_0/raster/r.thin/thin_lines.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.thin/thin_lines.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.thin/thin_lines.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -165,7 +165,7 @@
} /* end row loop */
} /* j-loop */
- G_message(_n("Deleted %d pixel", "Deleted %d pixels", deleted), deleted);
+ G_message(n_("Deleted %d pixel", "Deleted %d pixels", deleted), deleted);
} /* while delete >0 */
if ((deleted == 0) && (i <= iterations))
Modified: grass/branches/releasebranch_7_0/raster/r.watershed/ram/do_cum.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.watershed/ram/do_cum.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.watershed/ram/do_cum.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -471,7 +471,7 @@
}
}
if (workedon)
- G_warning(_n("MFD: A * path already processed when distributing flow: %d of %d cell",
+ G_warning(n_("MFD: A * path already processed when distributing flow: %d of %d cell",
"MFD: A * path already processed when distributing flow: %d of %d cells",
do_points),
workedon, do_points);
Modified: grass/branches/releasebranch_7_0/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.watershed/seg/init_vars.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/raster/r.watershed/seg/init_vars.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -129,7 +129,7 @@
if (seg_flag || bas_flag || haf_flag)
tot_parts++;
- G_message(_n("SECTION 1 beginning: Initiating Variables. %d section total.",
+ G_message(n_("SECTION 1 beginning: Initiating Variables. %d section total.",
"SECTION 1 beginning: Initiating Variables. %d sections total.",
tot_parts),
tot_parts);
Modified: grass/branches/releasebranch_7_0/vector/v.build.polylines/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.build.polylines/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.build.polylines/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -227,11 +227,11 @@
polyline++;
}
- G_verbose_message(_n("%d line or boundaries found in input vector map",
+ G_verbose_message(n_("%d line or boundaries found in input vector map",
"%d lines or boundaries found in input vector map",
nlines),
nlines, Vect_get_name(&map), Vect_get_mapset(&map));
- G_verbose_message(_n("%d polyline stored in output vector map",
+ G_verbose_message(n_("%d polyline stored in output vector map",
"%d polylines stored in output vector map",
polyline),
polyline, Vect_get_name(&Out), Vect_get_mapset(&Out));
Modified: grass/branches/releasebranch_7_0/vector/v.category/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.category/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.category/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -214,7 +214,7 @@
Clist->field = atoi(field_opt->answer);
ret = Vect_str_to_cat_list(id_opt->answer, Clist);
if (ret > 0) {
- G_warning(_n("%d error in id option",
+ G_warning(n_("%d error in id option",
"%d errors in id option",
ret), ret);
}
@@ -375,7 +375,7 @@
new_centr++;
}
if (new_centr > 0)
- G_message(_n("%d new centroid placed in output map",
+ G_message(n_("%d new centroid placed in output map",
"%d new centroids placed in output map",
new_centr), new_centr);
}
@@ -770,7 +770,7 @@
fields[0], fields[i]);
if (option != O_REP && option != O_PRN)
- G_done_msg(_n("%d feature modified.",
+ G_done_msg(n_("%d feature modified.",
"%d features modified.",
nmodified), nmodified);
Modified: grass/branches/releasebranch_7_0/vector/v.edit/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.edit/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.edit/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -271,7 +271,7 @@
int iline;
struct ilist *List_added;
- G_message(_n("%d feature added",
+ G_message(n_("%d feature added",
"%d features added",
ret), ret);
@@ -291,7 +291,7 @@
int nclosed;
nclosed = close_lines(&Map, GV_BOUNDARY, thresh[THRESH_SNAP]);
- G_message(_n("%d boundary closed",
+ G_message(n_("%d boundary closed",
"%d boundaries closed",
nclosed), nclosed);
}
@@ -300,7 +300,7 @@
break;
case MODE_DEL:
ret = Vedit_delete_lines(&Map, List);
- G_message(_n("%d feature deleted",
+ G_message(n_("%d feature deleted",
"%d features deleted",
ret), ret);
break;
@@ -311,7 +311,7 @@
G_verbose_message(_("Threshold value for snapping is %.2f"),
thresh[THRESH_SNAP]);
ret = Vedit_move_lines(&Map, BgMap, nbgmaps, List, move_x, move_y, move_z, snap, thresh[THRESH_SNAP]);
- G_message(_n("%d feature moved",
+ G_message(n_("%d feature moved",
"%d features moved",
ret), ret);
break;
@@ -322,19 +322,19 @@
G_verbose_message(_("Threshold value for snapping is %.2f"),
thresh[THRESH_SNAP]);
ret = Vedit_move_vertex(&Map, BgMap, nbgmaps, List, coord, thresh[THRESH_COORDS], thresh[THRESH_SNAP], move_x, move_y, move_z, move_first, snap);
- G_message(_n("%d vertex moved",
+ G_message(n_("%d vertex moved",
"%d vertices moved",
ret), ret);
break;
case MODE_VERTEX_ADD:
ret = Vedit_add_vertex(&Map, List, coord, thresh[THRESH_COORDS]);
- G_message(_n("%d vertex added",
+ G_message(n_("%d vertex added",
"%d vertices added",
ret), ret);
break;
case MODE_VERTEX_DELETE:
ret = Vedit_remove_vertex(&Map, List, coord, thresh[THRESH_COORDS]);
- G_message(_n("%d vertex removed",
+ G_message(n_("%d vertex removed",
"%d vertices removed",
ret), ret);
break;
@@ -346,7 +346,7 @@
else {
ret = Vect_break_lines_list(&Map, List, NULL, GV_LINES, NULL);
}
- G_message(_n("%d line broken",
+ G_message(n_("%d line broken",
"%d lines broken",
ret), ret);
break;
@@ -354,13 +354,13 @@
G_verbose_message(_("Threshold value for snapping is %.2f"),
thresh[THRESH_SNAP]);
ret = Vedit_connect_lines(&Map, List, thresh[THRESH_SNAP]);
- G_message(_n("%d line connected",
+ G_message(n_("%d line connected",
"%d lines connected",
ret), ret);
break;
case MODE_MERGE:
ret = Vedit_merge_lines(&Map, List);
- G_message(_n("%d line merged",
+ G_message(n_("%d line merged",
"%d lines merged",
ret), ret);
break;
@@ -369,13 +369,13 @@
break;
case MODE_CATADD:
ret = Vedit_modify_cats(&Map, List, layer, 0, Clist);
- G_message(_n("%d feature modified",
+ G_message(n_("%d feature modified",
"%d features modified",
ret), ret);
break;
case MODE_CATDEL:
ret = Vedit_modify_cats(&Map, List, layer, 1, Clist);
- G_message(_n("%d feature modified",
+ G_message(n_("%d feature modified",
"%d features modified",
ret), ret);
break;
@@ -392,7 +392,7 @@
else {
ret = Vedit_copy_lines(&Map, NULL, List);
}
- G_message(_n("%d feature copied",
+ G_message(n_("%d feature copied",
"%d features copied",
ret), ret);
break;
@@ -403,7 +403,7 @@
break;
case MODE_FLIP:
ret = Vedit_flip_lines(&Map, List);
- G_message(_n("%d line flipped",
+ G_message(n_("%d line flipped",
"%d lines flipped",
ret), ret);
break;
@@ -424,7 +424,7 @@
ret = Vedit_bulk_labeling(&Map, List,
x1, y1, x2, y2, start, step);
- G_message(_n("%d line labeled",
+ G_message(n_("%d line labeled",
"%d lines labeled",
ret), ret);
break;
@@ -433,7 +433,7 @@
ret = Vedit_chtype_lines(&Map, List);
if (ret > 0) {
- G_message(_n("%d feature converted",
+ G_message(n_("%d feature converted",
"%d features converted",
ret), ret);
}
@@ -452,7 +452,7 @@
ret += Vedit_delete_area_centroid(&Map, List->value[i]);
}
- G_message(_n("%d area removed",
+ G_message(n_("%d area removed",
"%d areas removed",
ret), ret);
break;
Modified: grass/branches/releasebranch_7_0/vector/v.edit/select.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.edit/select.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.edit/select.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -173,7 +173,7 @@
reverse_selection(Map, type, &List);
}
- G_message(_n("%d of %d feature selected from vector map <%s>",
+ G_message(n_("%d of %d feature selected from vector map <%s>",
"%d of %d features selected from vector map <%s>",
Vect_get_num_lines(Map)
),
Modified: grass/branches/releasebranch_7_0/vector/v.external/list.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.external/list.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.external/list.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -176,7 +176,7 @@
ntables = PQntuples(res);
G_debug(3, " nrows = %d", ntables);
if (fd)
- G_message(_n("PostGIS database <%s> contains %d feature table:",
+ G_message(n_("PostGIS database <%s> contains %d feature table:",
"PostGIS database <%s> contains %d feature tables:",
ntables),
PQdb(conn), ntables);
@@ -264,7 +264,7 @@
nlayers = OGR_DS_GetLayerCount(Ogr_ds);
if (fd)
- G_message(_n("Data source <%s> (format '%s') contains %d layer:",
+ G_message(n_("Data source <%s> (format '%s') contains %d layer:",
"Data source <%s> (format '%s') contains %d layers:",
nlayers),
dsn, OGR_Dr_GetName(OGR_DS_GetDriver(Ogr_ds)), nlayers);
Modified: grass/branches/releasebranch_7_0/vector/v.extract/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.extract/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.extract/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -265,7 +265,7 @@
if (ncats == -1)
G_fatal_error(_("Unable select records from table <%s>"),
Fi->table);
- G_verbose_message(_n("%d category loaded",
+ G_verbose_message(n_("%d category loaded",
"%d categories loaded",
ncats), ncats);
Modified: grass/branches/releasebranch_7_0/vector/v.in.ascii/points.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.ascii/points.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.in.ascii/points.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -295,7 +295,7 @@
G_free(ytoken);
if (region_flag)
- G_message(_n("Skipping %d of %d row falling outside of current region",
+ G_message(n_("Skipping %d of %d row falling outside of current region",
"Skipping %d of %d rows falling outside of current region",
row - 1),
skipped, row - 1);
Modified: grass/branches/releasebranch_7_0/vector/v.in.db/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.db/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.in.db/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -337,7 +337,7 @@
Vect_build(&Map);
Vect_close(&Map);
- G_done_msg(_n("%d point written to vector map.",
+ G_done_msg(n_("%d point written to vector map.",
"%d points written to vector map.",
count), count);
Modified: grass/branches/releasebranch_7_0/vector/v.kernel/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.kernel/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.kernel/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -296,8 +296,8 @@
G_get_window(&window);
G_verbose_message(_("Standard deviation: %f"), sigma);
- G_asprintf(&tmpstr1, _n("%d row", "%d rows", window.rows), window.rows);
- G_asprintf(&tmpstr2, _n("%d column", "%d columns", window.cols), window.cols);
+ G_asprintf(&tmpstr1, n_("%d row", "%d rows", window.rows), window.rows);
+ G_asprintf(&tmpstr2, n_("%d column", "%d columns", window.cols), window.cols);
/* GTC First argument is resolution, second - number of rows as a text, third - number of columns as a text. */
G_verbose_message(_("Output raster map: resolution: %f\t%s\t%s"),
window.ew_res, tmpstr1, tmpstr2);
@@ -346,7 +346,7 @@
}
if (notreachable > 0)
- G_warning(_n("%d point outside threshold",
+ G_warning(n_("%d point outside threshold",
"%d points outside threshold",
notreachable), notreachable);
}
@@ -391,7 +391,7 @@
}
G_message(_("Number of input points: %d."), npoints);
- G_message(_n("%d distance read from the map.",
+ G_message(n_("%d distance read from the map.",
"%d distances read from the map.",
ndists), ndists);
Modified: grass/branches/releasebranch_7_0/vector/v.lidar.correction/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lidar.correction/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.lidar.correction/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -270,10 +270,10 @@
P_get_edge(P_BILINEAR, &dims, stepE, stepN);
P_set_dim(&dims, stepE, stepN, &nsplx_adj, &nsply_adj);
- G_verbose_message(_n("adjusted EW spline %d",
+ G_verbose_message(n_("adjusted EW spline %d",
"adjusted EW splines %d",
nsplx_adj), nsplx_adj);
- G_verbose_message(_n("adjusted NS spline %d",
+ G_verbose_message(n_("adjusted NS spline %d",
"adjusted NS splines %d",
nsply_adj), nsply_adj);
Modified: grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.segment/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.segment/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.segment/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -353,26 +353,26 @@
if (file_opt->answer)
fclose(in_file);
- G_message(_n("[%d] point read from input",
+ G_message(n_("[%d] point read from input",
"[%d] points read from input",
points_read), points_read);
- G_asprintf(&tmpstr1, _n("%d lost", "%d lost",
+ G_asprintf(&tmpstr1, n_("%d lost", "%d lost",
points_read - points_written),
points_read - points_written);
/* GTC %s will be replaced with a message about lost points. */
- G_message(_n("[%d] point written to output map (%s)",
+ G_message(n_("[%d] point written to output map (%s)",
"[%d] points written to output map (%s)",
points_written),
points_written, tmpstr1);
G_free(tmpstr1);
- G_message(_n("[%d] line read from input",
+ G_message(n_("[%d] line read from input",
"[%d] lines read from input",
lines_read), lines_read);
- G_asprintf(&tmpstr1, _n("%d lost", "%d lost",
+ G_asprintf(&tmpstr1, n_("%d lost", "%d lost",
lines_read - lines_written),
lines_read - lines_written);
/* GTC %s will be replaced with a message about lost lines. */
- G_message(_n("[%d] line written to output map (%s)",
+ G_message(n_("[%d] line written to output map (%s)",
"[%d] lines written to output map (%s)",
lines_written),
lines_written, tmpstr1);
Modified: grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.where/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.where/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.where/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -219,22 +219,22 @@
Vect_close(&LMap);
Vect_close(&PMap);
- G_message(_n("[%d] point read from input",
+ G_message(n_("[%d] point read from input",
"[%d] points read from input",
n_points), n_points);
- G_message(_n("[%d] position found",
+ G_message(n_("[%d] position found",
"[%d] positions found",
n_found), n_found);
if (n_outside)
- G_message(_n("[%d] point outside threshold",
+ G_message(n_("[%d] point outside threshold",
"[%d] points outside threshold",
n_outside), n_outside);
if (n_no_record)
- G_message(_n("[%d] point - no record found",
+ G_message(n_("[%d] point - no record found",
"[%d] points - no record found",
n_no_record), n_no_record);
if (n_many_records)
- G_message(_n("[%d] point - too many records found",
+ G_message(n_("[%d] point - too many records found",
"[%d] points - too many records found",
n_many_records), n_many_records);
Modified: grass/branches/releasebranch_7_0/vector/v.net.distance/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.net.distance/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.net.distance/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -351,7 +351,7 @@
G_free(prev);
if (from_nr)
- G_warning(_n("%d 'from' feature was not reachable",
+ G_warning(n_("%d 'from' feature was not reachable",
"%d 'from' features were not reachable",
from_nr), from_nr);
Modified: grass/branches/releasebranch_7_0/vector/v.out.ascii/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.ascii/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.out.ascii/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -104,7 +104,7 @@
G_fatal_error(_("Layer <%s> not found"), field_name);
ret = Vect_str_to_cat_list(cats, clist);
if (ret > 0)
- G_fatal_error(_n("%d error in <%s> option",
+ G_fatal_error(n_("%d error in <%s> option",
"%d errors in <%s> option",
ret),
ret, "cats");
Modified: grass/branches/releasebranch_7_0/vector/v.out.ogr/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.ogr/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.out.ogr/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -309,7 +309,7 @@
/* check what users wants to export and what's present in the map */
if (Vect_get_num_primitives(&In, GV_POINT) > 0 && !(otype & GV_POINTS))
- G_warning(_n("%d point found, but not requested to be exported. "
+ G_warning(n_("%d point found, but not requested to be exported. "
"Verify 'type' parameter.",
"%d points found, but not requested to be exported. "
"Verify 'type' parameter.",
@@ -317,7 +317,7 @@
Vect_get_num_primitives(&In, GV_POINT));
if (Vect_get_num_primitives(&In, GV_LINE) > 0 && !(otype & GV_LINES))
- G_warning(_n("%d line found, but not requested to be exported. "
+ G_warning(n_("%d line found, but not requested to be exported. "
"Verify 'type' parameter.",
"%d line(s) found, but not requested to be exported. "
"Verify 'type' parameter.",
@@ -326,7 +326,7 @@
if (Vect_get_num_primitives(&In, GV_BOUNDARY) > 0 &&
!(otype & GV_BOUNDARY) && !(otype & GV_AREA))
- G_warning(_n("%d boundary found, but not requested to be exported. "
+ G_warning(n_("%d boundary found, but not requested to be exported. "
"Verify 'type' parameter.",
"%d boundaries found, but not requested to be exported. "
"Verify 'type' parameter.",
@@ -335,7 +335,7 @@
if (Vect_get_num_primitives(&In, GV_CENTROID) > 0 &&
!(otype & GV_CENTROID) && !(otype & GV_AREA))
- G_warning(_n("%d centroid found, but not requested to be exported. "
+ G_warning(n_("%d centroid found, but not requested to be exported. "
"Verify 'type' parameter.",
"%d centroids found, but not requested to be exported. "
"Verify 'type' parameter.",
@@ -343,7 +343,7 @@
Vect_get_num_primitives(&In, GV_CENTROID));
if (Vect_get_num_areas(&In) > 0 && !(otype & GV_AREA))
- G_warning(_n("%d area found, but not requested to be exported. "
+ G_warning(n_("%d area found, but not requested to be exported. "
"Verify 'type' parameter.",
"%d areas found, but not requested to be exported. "
"Verify 'type' parameter.",
@@ -351,7 +351,7 @@
Vect_get_num_areas(&In));
if (Vect_get_num_primitives(&In, GV_FACE) > 0 && !(otype & GV_FACE))
- G_warning(_n("%d face found, but not requested to be exported. "
+ G_warning(n_("%d face found, but not requested to be exported. "
"Verify 'type' parameter.",
"%d faces found, but not requested to be exported. "
"Verify 'type' parameter.",
@@ -359,7 +359,7 @@
Vect_get_num_primitives(&In, GV_FACE));
if (Vect_get_num_volumes(&In) > 0 && !(otype & GV_VOLUME))
- G_warning(_n("%d volume found, but not requested to be exported. "
+ G_warning(n_("%d volume found, but not requested to be exported. "
"Verify 'type' parameter.",
"%d volumes found, but not requested to be exported. "
"Verify 'type' parameter.",
@@ -714,7 +714,7 @@
/* Lines (run always to count features of different type) */
if (otype & (GV_POINTS | GV_LINES | GV_KERNEL | GV_FACE)) {
- G_message(_n("Exporting %d feature...",
+ G_message(n_("Exporting %d feature...",
"Exporting %d features...",
Vect_get_num_primitives(&In, otype)),
Vect_get_num_primitives(&In, otype));
@@ -729,7 +729,7 @@
/* Areas (run always to count features of different type) */
if (Vect_get_num_areas(&In) > 0 && (otype & GV_AREA)) {
- G_message(_n("Exporting %d area (may take some time)...",
+ G_message(n_("Exporting %d area (may take some time)...",
"Exporting %d areas (may take some time)...",
Vect_get_num_areas(&In)),
Vect_get_num_areas(&In));
@@ -748,7 +748,7 @@
which output format would know the difference?
*/
if (Vect_get_num_volumes(&In) > 0 && (otype & GV_VOLUME)) {
- G_message(_n("Exporting %d volume...",
+ G_message(n_("Exporting %d volume...",
"Exporting %d volumes...",
Vect_get_num_volumes(&In)),
Vect_get_num_volumes(&In));
@@ -769,17 +769,17 @@
/* Summary */
if (n_noatt > 0)
- G_important_message(_n("%d feature without attributes was written",
+ G_important_message(n_("%d feature without attributes was written",
"%d features without attributes were written",
n_noatt), n_noatt);
if (n_nocat > 0) {
if (donocat)
- G_important_message(_n("%d feature without category was written",
+ G_important_message(n_("%d feature without category was written",
"%d features without category were written",
n_nocat), n_nocat);
else
- G_warning(_n("%d feature without category was skipped. "
+ G_warning(n_("%d feature without category was skipped. "
"Features without category are written only when -%c flag is given.",
"%d features without category were skipped. "
"Features without category are written only when -%c flag is given.",
@@ -796,7 +796,7 @@
if (n_feat < 1)
G_warning(_("Output layer is empty, no features written"));
- G_done_msg(_n("%d feature (%s type) written to <%s> (%s format).",
+ G_done_msg(n_("%d feature (%s type) written to <%s> (%s format).",
"%d features (%s type) written to <%s> (%s format).",
n_feat), n_feat,
OGRGeometryTypeToName(wkbtype),
Modified: grass/branches/releasebranch_7_0/vector/v.out.postgis/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.postgis/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.out.postgis/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -164,13 +164,13 @@
Vect_get_name(&Out));
if (!flags.topo->answer)
- G_done_msg(_n("%d feature (%s type) written to <%s>.",
+ G_done_msg(n_("%d feature (%s type) written to <%s>.",
"%d features (%s type) written to <%s>.",
Vect_sfa_get_num_features(&Out)),
Vect_sfa_get_num_features(&Out), Vect_get_finfo_geometry_type(&Out),
Vect_get_name(&Out));
else
- G_done_msg(_n("%d primitive written to <%s>.",
+ G_done_msg(n_("%d primitive written to <%s>.",
"%d primitives written to <%s>.",
Vect_get_num_lines(&Out)),
Vect_get_num_lines(&Out),
Modified: grass/branches/releasebranch_7_0/vector/v.out.pov/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.pov/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.out.pov/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -215,7 +215,7 @@
Vect_close(&In);
/* Summary */
- G_done_msg(_n("%d feature written.",
+ G_done_msg(n_("%d feature written.",
"%d features written.",
count), count);
Modified: grass/branches/releasebranch_7_0/vector/v.overlay/area_area.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.overlay/area_area.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.overlay/area_area.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -96,7 +96,7 @@
Vect_destroy_boxlist(boxlist);
Vect_destroy_list(reflist);
- G_verbose_message(_n("%d boundary snapped",
+ G_verbose_message(n_("%d boundary snapped",
"%d boundaries snapped",
snapped_lines), snapped_lines);
}
Modified: grass/branches/releasebranch_7_0/vector/v.sample/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.sample/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.sample/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -151,7 +151,7 @@
if (nrecords < 0)
G_fatal_error(_("Unable to select data from table"));
- G_verbose_message(_n("%d record selected from table",
+ G_verbose_message(n_("%d record selected from table",
"%d records selected from table",
nrecords), nrecords);
Modified: grass/branches/releasebranch_7_0/vector/v.segment/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.segment/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.segment/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -258,24 +258,24 @@
Vect_build(&Out);
- G_message(_n("%d point read from input",
+ G_message(n_("%d point read from input",
"%d points read from input",
points_read), points_read);
/* GTC Number of lost points */
- G_asprintf(&tmpstr1, _n("%d lost", "%d lost", points_read - points_written), points_read - points_written);
+ G_asprintf(&tmpstr1, n_("%d lost", "%d lost", points_read - points_written), points_read - points_written);
/* GTC %s is replaced with message indicating number of lost points. */
- G_message(_n("%d point written to output map (%s)",
+ G_message(n_("%d point written to output map (%s)",
"%d points written to output map (%s)",
points_written),
points_written, tmpstr1);
G_free(tmpstr1);
- G_message(_n("%d line read from input",
+ G_message(n_("%d line read from input",
"%d lines read from input",
lines_read), lines_read);
/* GTC Number of lost lines */
- G_asprintf(&tmpstr1, _n("%d lost", "%d lost", lines_read - lines_written), lines_read - lines_written);
+ G_asprintf(&tmpstr1, n_("%d lost", "%d lost", lines_read - lines_written), lines_read - lines_written);
/* GTC %s is replaced with message indicating number of lost lines. */
- G_message(_n("%d line written to output map (%s)",
+ G_message(n_("%d line written to output map (%s)",
"%d lines written to output map (%s)",
lines_written),
lines_written, tmpstr1);
Modified: grass/branches/releasebranch_7_0/vector/v.surf.idw/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.idw/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.surf.idw/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -256,9 +256,9 @@
fd = Rast_open_new(parm.output->answer, DCELL_TYPE);
/* GTC Count of window rows */
- G_asprintf(&tmpstr1, _n("%d row", "%d rows", window.rows), window.rows);
+ G_asprintf(&tmpstr1, n_("%d row", "%d rows", window.rows), window.rows);
/* GTC Count of window columns */
- G_asprintf(&tmpstr2, _n("%d column", "%d columns", window.cols), window.cols);
+ G_asprintf(&tmpstr2, n_("%d column", "%d columns", window.cols), window.cols);
/* GTC First argument is map name, second - message about number of rows, third - columns. */
G_important_message(_("Interpolating raster map <%s> (%s, %s)..."),
parm.output->answer, tmpstr1, tmpstr2);
Modified: grass/branches/releasebranch_7_0/vector/v.surf.idw/read_sites.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.idw/read_sites.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.surf.idw/read_sites.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -67,7 +67,7 @@
if (nrec < 0)
G_fatal_error(_("Unable to select data from table"));
- G_verbose_message(_n("One record selected from table", "%d records selected from table", nrec), nrec);
+ G_verbose_message(n_("One record selected from table", "%d records selected from table", nrec), nrec);
db_close_database_shutdown_driver(Driver);
}
@@ -120,5 +120,5 @@
Vect_set_release_support(&Map);
Vect_close(&Map);
- G_message(_n("%ld point loaded", "%ld points loaded", npoints), npoints);
+ G_message(n_("%ld point loaded", "%ld points loaded", npoints), npoints);
}
Modified: grass/branches/releasebranch_7_0/vector/v.voronoi/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.voronoi/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.voronoi/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -223,7 +223,7 @@
plot = 0;
debug = 0;
- G_message(_n("Voronoi triangulation for %d point...",
+ G_message(n_("Voronoi triangulation for %d point...",
"Voronoi triangulation for %d points...",
nsites), nsites);
voronoi(nextone);
Modified: grass/branches/releasebranch_7_0/vector/v.voronoi/sw_main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.voronoi/sw_main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.voronoi/sw_main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -185,7 +185,7 @@
if (nsites < 2) {
const char *name = Vect_get_full_name(&In);
Vect_close(&In);
- G_fatal_error(_n("Found %d point/centroid in <%s>, but at least 2 are needed",
+ G_fatal_error(n_("Found %d point/centroid in <%s>, but at least 2 are needed",
"Found %d points/centroids in <%s>, but at least 2 are needed",
nsites),
nsites, name);
@@ -465,7 +465,7 @@
if (nsites < 2) {
const char *name = Vect_get_full_name(&In);
Vect_close(&In);
- G_fatal_error(_n("Found %d vertex in <%s>, but at least 2 are needed",
+ G_fatal_error(n_("Found %d vertex in <%s>, but at least 2 are needed",
"Found %d vertices in <%s>, but at least 2 are needed",
nsites),
nsites, name);
Modified: grass/branches/releasebranch_7_0/vector/v.what.rast3/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.what.rast3/main.c 2015-05-22 15:06:44 UTC (rev 65312)
+++ grass/branches/releasebranch_7_0/vector/v.what.rast3/main.c 2015-05-24 12:32:46 UTC (rev 65313)
@@ -211,12 +211,12 @@
/* Report number of points not used */
if (outside_cnt)
- G_warning(_n("%d point outside current region was skipped",
+ G_warning(n_("%d point outside current region was skipped",
"%d points outside current region were skipped",
outside_cnt), outside_cnt);
if (nocat_cnt)
- G_warning(_n("%d point without category was skipped",
+ G_warning(n_("%d point without category was skipped",
"%d points without category were skipped",
nocat_cnt), nocat_cnt);
@@ -325,25 +325,25 @@
db_free_string(&stmt);
/* Report */
- G_verbose_message(_n("%d category loaded from table",
+ G_verbose_message(n_("%d category loaded from table",
"%d categories loaded from table",
select), select);
- G_verbose_message(_n("%d category loaded from vector",
+ G_verbose_message(n_("%d category loaded from vector",
"%d categories loaded from vector",
point_cnt), point_cnt);
- G_verbose_message(_n("%d category from vector missing in table",
+ G_verbose_message(n_("%d category from vector missing in table",
"%d categories from vector missing in table",
norec_cnt), norec_cnt);
if (dupl_cnt > 0)
- G_message(_n("%d duplicate category in vector",
+ G_message(n_("%d duplicate category in vector",
"%d duplicate categories in vector",
dupl_cnt), dupl_cnt);
if (upderr_cnt > 0)
- G_warning(_n("%d update error",
+ G_warning(n_("%d update error",
"%d update errors",
upderr_cnt), upderr_cnt);
- G_done_msg(_n("%d record updated.",
+ G_done_msg(n_("%d record updated.",
"%d records updated.",
update_cnt), update_cnt);
More information about the grass-commit
mailing list