Fix undesired line breaks in _(

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

db/base/copy.c

@@ -33,8 +33,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("database, SQL");
     module->description =
-	_
-	("Copy a table. Either 'from_table' (optionaly with 'where') can be used "
+	_("Copy a table. Either 'from_table' (optionaly with 'where') can be used "
 	 "or 'select' option, but not 'from_table' and 'select' at the same time.");
 
     from_driver = G_define_option();
@@ -97,8 +96,7 @@ int main(int argc, char **argv)
     select->type = TYPE_STRING;
     select->required = NO;
     select->description =
-	_
-	("Full select statement (only, if 'from_table' and 'where' is not used), e.g.:\n"
+	_("Full select statement (only, if 'from_table' and 'where' is not used), e.g.:\n"
 	 "\t\tSELECT dedek FROM starobince WHERE obec = 'Frimburg'");
 
     if (G_parser(argc, argv))

display/d.barscale/main.c

@@ -81,8 +81,7 @@ int main(int argc, char **argv)
     opt1->answer = DEFAULT_BG_COLOR;
     opt1->required = NO;
     opt1->description =
-	_
-	("Background color, either a standard GRASS color, R:G:B triplet, or \"none\"");
+	_("Background color, either a standard GRASS color, R:G:B triplet, or \"none\"");
     opt1->gisprompt = GISPROMPT_COLOR;
 
     opt2 = G_define_option();
@@ -102,8 +101,7 @@ int main(int argc, char **argv)
     opt3->options = "0-100";
     opt3->required = NO;
     opt3->description =
-	_
-	("The screen coordinates for top-left corner of label ([0,0] is top-left of frame)");
+	_("The screen coordinates for top-left corner of label ([0,0] is top-left of frame)");
 
     if (G_parser(argc, argv) < 0)
 	exit(EXIT_FAILURE);

display/d.erase/main.c

@@ -29,8 +29,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("display");
     module->description =
-	_
-	("Erase the contents of the active display frame with user defined color");
+	_("Erase the contents of the active display frame with user defined color");
 
     color = G_define_option();
     color->key = "color";
@@ -38,8 +37,7 @@ int main(int argc, char *argv[])
     color->required = NO;
     color->answer = DEFAULT_BG_COLOR;
     color->description =
-	_
-	("Color to erase with, either a standard GRASS color or R:G:B triplet (separated by colons)");
+	_("Color to erase with, either a standard GRASS color or R:G:B triplet (separated by colons)");
     color->gisprompt = GISPROMPT_COLOR;
 
     eraseframe = G_define_flag();

display/d.info/main.c

@@ -53,8 +53,7 @@ int main(int argc, char *argv[])
     gflag = G_define_flag();
     gflag->key = 'g';
     gflag->description =
-	_
-	("Display screen rectangle coordinates and resolution (west, east, north, south, ewres, nsres)");
+	_("Display screen rectangle coordinates and resolution (west, east, north, south, ewres, nsres)");
 
     cflag = G_define_flag();
     cflag->key = 'c';

display/d.legend/main.c

@@ -130,8 +130,7 @@ int main(int argc, char **argv)
     opt7->required = NO;
     opt7->options = "0-100";
     opt7->label =
-	_
-	("Placement as percentage of screen coordinates (0,0 is lower left)");
+	_("Placement as percentage of screen coordinates (0,0 is lower left)");
     opt7->description = opt7->key_desc;
     opt7->answer = NULL;
 

display/d.linegraph/linegraph.c

@@ -112,8 +112,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("display");
     module->description =
-	_
-	("Generates and displays simple line graphs in the active graphics monitor display frame.");
+	_("Generates and displays simple line graphs in the active graphics monitor display frame.");
 
     x_opt = G_define_option();
     x_opt->key = "x_file";

display/d.text.new/main.c

@@ -176,8 +176,7 @@ int main(int argc, char **argv)
     opt.at->type = TYPE_DOUBLE;
     opt.at->required = NO;
     opt.at->description =
-	_
-	("Screen position at which text will begin to be drawn (percentage, [0,0] is lower left)");
+	_("Screen position at which text will begin to be drawn (percentage, [0,0] is lower left)");
 
     opt.align = G_define_option();
     opt.align->key = "align";

display/d.thematic.area/main.c

@@ -176,8 +176,7 @@ int main(int argc, char **argv)
     algoinfo_flag = G_define_flag();
     algoinfo_flag->key = 'e';
     algoinfo_flag->description =
-	_
-	("When printing legend info , include extended statistical info from classification algorithm");
+	_("When printing legend info , include extended statistical info from classification algorithm");
 
     nodraw_flag = G_define_flag();
     nodraw_flag->key = 'n';

display/d.vect/main.c

@@ -623,8 +623,7 @@ int main(int argc, char **argv)
     if (level >= 2 && (window.north < box.S || window.south > box.N ||
 		       window.east < box.W ||
 		       window.west > G_adjust_easting(box.E, &window))) {
-	G_message(_
-		  ("The bounding box of the map is outside the current region, "
+	G_message(_("The bounding box of the map is outside the current region, "
 		   "nothing drawn."));
 	stat = 0;
     }
@@ -663,8 +662,7 @@ int main(int argc, char **argv)
 
 	if (display & DISP_SHAPE) {
 	    if (id_flag->answer && level < 2) {
-		G_warning(_
-			  ("Cannot display lines by id, topology not available"));
+		G_warning(_("Cannot display lines by id, topology not available"));
 	    }
 	    else {
 		stat = plot1(&Map, type, area, Clist,

display/d.what.rast/main.c

@@ -78,8 +78,7 @@ int main(int argc, char **argv)
     colrow = G_define_flag();
     colrow->key = 'c';
     colrow->description =
-	_
-	("Print out col/row for the entire map in grid resolution of the region");
+	_("Print out col/row for the entire map in grid resolution of the region");
 
     if (argc > 1 && G_parser(argc, argv))
 	exit(EXIT_FAILURE);

display/d.what.vect/what.c

@@ -222,8 +222,7 @@ int what(int once, int txt, int terse, int width, int mwidth,
 
 			Vect_get_node_coor(&(Map[i]), node[n], &nx, &ny, &nz);
 			fprintf(stdout,
-				_
-				("  Node[%d]: %d  Number of lines: %d  Coordinates: %.6f, %.6f, %.6f\n"),
+				_("  Node[%d]: %d  Number of lines: %d  Coordinates: %.6f, %.6f, %.6f\n"),
 				n, node[n], nnlines, nx, ny, nz);
 
 			for (nli = 0; nli < nnlines; nli++) {
@@ -356,13 +355,11 @@ int what(int once, int txt, int terse, int width, int mwidth,
 			    ((sq_meters * 10.763649) / 43560.) / 640.);
 		    if (notty) {
 			fprintf(stderr,
-				_
-				("Size - Sq Meters: %.3f\t\tHectares: %.3f\n"),
+				_("Size - Sq Meters: %.3f\t\tHectares: %.3f\n"),
 				sq_meters, (sq_meters / 10000.));
 
 			fprintf(stderr,
-				_
-				("           Acres: %.3f\t\tSq Miles: %.4f\n"),
+				_("           Acres: %.3f\t\tSq Miles: %.4f\n"),
 				((sq_meters * 10.763649) / 43560.),
 				((sq_meters * 10.763649) / 43560.) / 640.);
 		    }
@@ -411,8 +408,7 @@ int what(int once, int txt, int terse, int width, int mwidth,
 
 			if (txt) {
 			    fprintf(stdout,
-				    _
-				    ("driver: %s\ndatabase: %s\ntable: %s\nkey column: %s\n"),
+				    _("driver: %s\ndatabase: %s\ntable: %s\nkey column: %s\n"),
 				    Fi->driver, Fi->database, Fi->table,
 				    Fi->key);
 			}

display/d.zoom/zoom.c

@@ -39,8 +39,7 @@ int zoomwindow(struct Cell_head *window, int quiet, double magnify)
     if (!quiet) {
 	fprintf(stderr, _("This region now saved as current region.\n\n"));
 	fprintf(stderr,
-		_
-		("Note: run 'd.erase' for the new region to affect the graphics.\n"));
+		_("Note: run 'd.erase' for the new region to affect the graphics.\n"));
     }
 #endif
     return (0);

general/g.access/main.c

@@ -36,8 +36,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("general");
     module->description =
-	_
-	("Controls access to the current mapset for other users on the system.");
+	_("Controls access to the current mapset for other users on the system.");
 
     group_opt = G_define_option();
     group_opt->key = "group";

general/g.dirseps/main.c

@@ -32,8 +32,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = "general";
     module->label =
-	_
-	("Internal GRASS utility for converting directory separator characters.");
+	_("Internal GRASS utility for converting directory separator characters.");
     module->description =
 	"Converts any directory separator characters in "
 	"the input string to or from native host format, and writes the changed "

general/g.mapset/main.c

@@ -65,8 +65,7 @@ int main(int argc, char *argv[])
     gisdbase_opt->required = NO;
     gisdbase_opt->multiple = NO;
     gisdbase_opt->description =
-	_
-	("New GISDBASE (full path to the directory where the new location is)");
+	_("New GISDBASE (full path to the directory where the new location is)");
 
     f_add = G_define_flag();
     f_add->key = 'c';

general/g.message/main.c

@@ -33,8 +33,7 @@ int main(int argc, char *argv[])
     module->label =
 	_("Prints a message, warning, or fatal error the GRASS way.");
     module->description =
-	_
-	("This module should be used in scripts for messages served to user.");
+	_("This module should be used in scripts for messages served to user.");
 
     warning = G_define_flag();
     warning->key = 'w';

general/g.setproj/main.c

@@ -607,8 +607,7 @@ int main(int argc, char *argv[])
 			}
 			while (1) {
 			    fprintf(stderr,
-				    _
-				    ("Enter conversion factor from %s to meters: "),
+				    _("Enter conversion factor from %s to meters: "),
 				    answer);
 			    G_gets(answer2);
 			    G_strip(answer2);
@@ -642,8 +641,7 @@ int main(int argc, char *argv[])
     if (G__put_window(&cellhd, "", "DEFAULT_WIND") < 0)
 	G_fatal_error(_("Unable to write to DEFAULT_WIND region file"));
     fprintf(stderr,
-	    _
-	    ("\nProjection information has been recorded for this location\n\n"));
+	    _("\nProjection information has been recorded for this location\n\n"));
     if ((old_zone != zone) | (old_proj != cellhd.proj)) {
 	G_message(_("The geographic region information in WIND is now obsolete"));
 	G_message(_("Run g.region -d to update it"));

general/g.transform/main.c

@@ -248,8 +248,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("general, transformation, GCP");
     module->description =
-	_
-	("Computes a coordinate transformation based on the control points.");
+	_("Computes a coordinate transformation based on the control points.");
 
     grp = G_define_standard_option(G_OPT_I_GROUP);
 

imagery/i.rectify/main.c

@@ -80,8 +80,7 @@ int main(int argc, char *argv[])
     c = G_define_flag();
     c->key = 'c';
     c->description =
-	_
-	("Use curr. region settings in target location (def.=calculate smallest area)");
+	_("Use curr. region settings in target location (def.=calculate smallest area)");
 
     a = G_define_flag();
     a->key = 'a';

lib/db/dbmi_base/legal_dbname.c

@@ -22,8 +22,7 @@ int db_legal_tablename(const char *s)
 
     if (*s == '.' || *s == 0) {
 	fprintf(stderr,
-		_
-		("Illegal table map name <%s>. May not contain '.' or 'NULL'.\n"),
+		_("Illegal table map name <%s>. May not contain '.' or 'NULL'.\n"),
 		buf);
 	return DB_FAILED;
     }
@@ -41,8 +40,7 @@ int db_legal_tablename(const char *s)
 	    ((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z') ||
 	     (*s >= '0' && *s <= '9') || *s == '_' || *s == '@')) {
 	    fprintf(stderr,
-		    _
-		    ("Illegal table map name <%s>. Character <%c> not allowed.\n"),
+		    _("Illegal table map name <%s>. Character <%c> not allowed.\n"),
 		    buf, *s);
 	    return DB_FAILED;
 	}

lib/gis/get_cellhd.c

@@ -102,8 +102,7 @@ int G_get_cellhd(const char *name, const char *mapset,
     tail = buf + strlen(buf);
     if (is_reclass) {
 	sprintf(tail,
-		_
-		(" It is a reclass of raster map <%s@%s> whose header file is invalid."),
+		_(" It is a reclass of raster map <%s@%s> whose header file is invalid."),
 		real_name, real_mapset);
     }
     else

lib/gis/get_ellipse.c

@@ -330,11 +330,9 @@ static int read_ellipsoid_table(int fatal)
 
     (fatal ? G_fatal_error : G_warning) ((err > 1)
 					 ?
-					 _
-					 ("Lines%s of ellipsoid table file <%s> are invalid")
+					 _("Lines%s of ellipsoid table file <%s> are invalid")
 					 :
-					 _
-					 ("Line%s of ellipsoid table file <%s> is invalid"),
+					 _("Line%s of ellipsoid table file <%s> is invalid"),
 					 badlines, file);
 
     return 0;

lib/gis/parser.c

@@ -2379,8 +2379,7 @@ static int check_required(void)
     while (opt != NULL) {
 	if (opt->required && opt->answer == NULL) {
 	    fprintf(stderr,
-		    _
-		    ("\nERROR: Required parameter <%s> not set:\n    (%s).\n"),
+		    _("\nERROR: Required parameter <%s> not set:\n    (%s).\n"),
 		    opt->key, opt->description);
 	    err++;
 	}
@@ -2475,8 +2474,7 @@ static int check_multiple_opts(void)
 	    /* if not correct multiple of items */
 	    if (n % n_commas) {
 		fprintf(stderr,
-			_
-			("\nERROR: option <%s> must be provided in multiples of %d\n"),
+			_("\nERROR: option <%s> must be provided in multiples of %d\n"),
 			opt->key, n_commas);
 		fprintf(stderr, _("       You provided %d items:\n"), n);
 		fprintf(stderr, "       %s\n", opt->answer);

lib/gpde/N_parse_options.c

@@ -55,8 +55,7 @@ struct Option *N_define_standard_option(int opt)
 	Opt->answer = "cg";
 	Opt->options = "gauss,lu,cholesky,jacobi,sor,cg,bicgstab,pcg";
 	Opt->description =
-	    _
-	    ("The type of solver which should solve the symmetric linear equation system");
+	    _("The type of solver which should solve the symmetric linear equation system");
 	break;
 	/*solver for unsymmetric linear equation systems */
     case N_OPT_SOLVER_UNSYMM:
@@ -67,8 +66,7 @@ struct Option *N_define_standard_option(int opt)
 	Opt->answer = "bicgstab";
 	Opt->options = "gauss,lu,jacobi,sor,bicgstab";
 	Opt->description =
-	    _
-	    ("The type of solver which should solve the linear equation system");
+	    _("The type of solver which should solve the linear equation system");
 	break;
     case N_OPT_MAX_ITERATIONS:
 	Opt->key = "maxit";
@@ -76,8 +74,7 @@ struct Option *N_define_standard_option(int opt)
 	Opt->required = NO;
 	Opt->answer = "100000";
 	Opt->description =
-	    _
-	    ("Maximum number of iteration used to solver the linear equation system");
+	    _("Maximum number of iteration used to solver the linear equation system");
 	break;
     case N_OPT_ITERATION_ERROR:
 	Opt->key = "error";
@@ -85,8 +82,7 @@ struct Option *N_define_standard_option(int opt)
 	Opt->required = NO;
 	Opt->answer = "0.0000000001";
 	Opt->description =
-	    _
-	    ("Error break criteria for iterative solvers (jacobi, sor, cg or bicgstab)");
+	    _("Error break criteria for iterative solvers (jacobi, sor, cg or bicgstab)");
 	break;
     case N_OPT_SOR_VALUE:
 	Opt->key = "relax";
@@ -94,8 +90,7 @@ struct Option *N_define_standard_option(int opt)
 	Opt->required = NO;
 	Opt->answer = "1";
 	Opt->description =
-	    _
-	    ("The relaxation parameter used by the jacobi and sor solver for speedup or stabilizing");
+	    _("The relaxation parameter used by the jacobi and sor solver for speedup or stabilizing");
 	break;
     case N_OPT_CALC_TIME:
 	Opt->key = "dt";

lib/proj/get_proj.c

@@ -225,8 +225,7 @@ int pj_get_kv(struct pj_info *info, struct Key_Value *in_proj_keys,
 
     if (!(pj = pj_init(nopt1, opt_in))) {
 	strcpy(buffa,
-	       _
-	       ("Unable to initialise PROJ.4 with the following parameter list:"));
+	       _("Unable to initialise PROJ.4 with the following parameter list:"));
 	for (i = 0; i < nopt1; i++) {
 	    char err[50];
 

ps/ps.map/main.c

@@ -122,8 +122,7 @@ int main(int argc, char *argv[])
     pflag = G_define_flag();
     pflag->key = 'p';
     pflag->description =
-	_
-	("List paper formats ( name width height left right top bottom(margin) )");
+	_("List paper formats ( name width height left right top bottom(margin) )");
 
     eflag = G_define_flag();
     eflag->key = 'e';
@@ -134,8 +133,7 @@ int main(int argc, char *argv[])
     input_file->key = "input";
     input_file->type = TYPE_STRING;
     input_file->description =
-	_
-	("File containing mapping instructions (or use input=- to enter from keyboard)");
+	_("File containing mapping instructions (or use input=- to enter from keyboard)");
     input_file->gisprompt = "old_file,file,input";
     input_file->required = NO;
 
@@ -151,8 +149,7 @@ int main(int argc, char *argv[])
     map_scale->key_desc = "mapscale";
     map_scale->type = TYPE_STRING;
     map_scale->description =
-	_
-	("Scale of the output map, e.g. 1:25000 (default: Auto-sized to fit page)");
+	_("Scale of the output map, e.g. 1:25000 (default: Auto-sized to fit page)");
 
     copies = G_define_option();
     copies->key = "copies";

raster/r.cats/main.c

@@ -81,8 +81,7 @@ int main(int argc, char *argv[])
     parm.file->key = "rules";
     parm.file->required = NO;
     parm.file->description =
-	_
-	("File containing category label rules (or \"-\" to read from stdin)");
+	_("File containing category label rules (or \"-\" to read from stdin)");
 
     parm.fmt_str = G_define_option();
     parm.fmt_str->key = "format";

raster/r.colors/main.c

@@ -124,8 +124,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("raster, color table");
     module->description =
-	_
-	("Creates/modifies the color table associated with a raster map layer.");
+	_("Creates/modifies the color table associated with a raster map layer.");
 
     opt.map = G_define_standard_option(G_OPT_R_MAP);
     opt.map->required = NO;

raster/r.colors/rules.c

@@ -39,8 +39,7 @@ int read_color_rules(FILE * fp, struct Colors *colors, DCELL min, DCELL max,
 
     if (isatty(fileno(fp))) {
 	fprintf(stderr,
-		_
-		("Enter rules, \"end\" when done, \"help\" if you need it.\n"));
+		_("Enter rules, \"end\" when done, \"help\" if you need it.\n"));
 
 	if (is_fp) {
 	    char minstr[64], maxstr[64];

raster/r.compress/main.c

@@ -105,11 +105,9 @@ static int process(char *name, int uncompress)
     if (G_is_reclass(name, G_mapset(), rname, rmapset) > 0) {
 	G_warning(uncompress
 		  ?
-		  _
-		  ("[%s] is a reclass file of map <%s> in mapset <%s> - can't uncompress")
+		  _("[%s] is a reclass file of map <%s> in mapset <%s> - can't uncompress")
 		  :
-		  _
-		  ("[%s] is a reclass file of map <%s> in mapset <%s> - can't compress"),
+		  _("[%s] is a reclass file of map <%s> in mapset <%s> - can't compress"),
 		  name, rname, rmapset);
 	return 1;
     }

raster/r.describe/main.c

@@ -55,8 +55,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Prints terse list of category values found in a raster map layer.");
+	_("Prints terse list of category values found in a raster map layer.");
 
     /* define different options */
     option.map = G_define_standard_option(G_OPT_R_MAP);

raster/r.digit/main.c

@@ -43,8 +43,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Interactive tool used to draw and save vector features on a graphics"
+	_("Interactive tool used to draw and save vector features on a graphics"
 	 " monitor using a pointing device (mouse) and save to a raster map.");
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);
@@ -53,8 +52,7 @@ int main(int argc, char **argv)
     bgcmd->key = "bgcmd";
     bgcmd->type = TYPE_STRING;
     bgcmd->description =
-	_
-	("Display commands to be used for canvas backdrop (separated by ';')");
+	_("Display commands to be used for canvas backdrop (separated by ';')");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

raster/r.grow.distance/main.c

@@ -119,8 +119,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Generates a raster map layer of distance to features in input layer.");
+	_("Generates a raster map layer of distance to features in input layer.");
 
     opt.in = G_define_standard_option(G_OPT_R_INPUT);
 

raster/r.gwflow/main.c

@@ -222,8 +222,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Numerical calculation program for transient, confined and unconfined groundwater flow in two dimensions.");
+	_("Numerical calculation program for transient, confined and unconfined groundwater flow in two dimensions.");
 
     /* Get parameters from user */
     set_params();

raster/r.in.ascii/main.c

@@ -71,8 +71,7 @@ int main(int argc, char *argv[])
 
     parm.input = G_define_standard_option(G_OPT_R_INPUT);
     parm.input->description =
-	_
-	("ASCII raster file to be imported. If not given reads from standard input");
+	_("ASCII raster file to be imported. If not given reads from standard input");
     parm.input->gisprompt = "old_file,file,input";
     parm.input->required = NO;
 

raster/r.in.gdal/main.c

@@ -78,8 +78,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster, import");
     module->description =
-	_
-	("Import GDAL supported raster file into a binary raster map layer.");
+	_("Import GDAL supported raster file into a binary raster map layer.");
 
     /* -------------------------------------------------------------------- */
     /*      Setup and fetch parameters.                                     */
@@ -396,12 +395,10 @@ int main(int argc, char *argv[])
 				cellhd.proj, cellhd.zone);
 		}
 		strcat(error_msg,
-		       _
-		       ("\nYou can use the -o flag to r.in.gdal to override this check and "
+		       _("\nYou can use the -o flag to r.in.gdal to override this check and "
 			"use the location definition for the dataset.\n"));
 		strcat(error_msg,
-		       _
-		       ("Consider generating a new location from the input dataset using "
+		       _("Consider generating a new location from the input dataset using "
 			"the 'location' parameter.\n"));
 		G_fatal_error(error_msg);
 	    }
@@ -522,8 +519,7 @@ int main(int argc, char *argv[])
 	    if (GDALGetGCPProjection(hDS) != NULL
 		&& strlen(GDALGetGCPProjection(hDS)) > 0) {
 		G_message("%s:\n%s",
-			  _
-			  ("GCPs have the following OpenGIS WKT Coordinate System:"),
+			  _("GCPs have the following OpenGIS WKT Coordinate System:"),
 			  GDALGetGCPProjection(hDS));
 	    }
 

raster/r.in.xyz/main.c

@@ -155,8 +155,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster, import, LIDAR");
     module->description =
-	_
-	("Create a raster map from an assemblage of many coordinates using univariate statistics.");
+	_("Create a raster map from an assemblage of many coordinates using univariate statistics.");
 
     input_opt = G_define_standard_option(G_OPT_F_INPUT);
     input_opt->description =
@@ -246,8 +245,7 @@ int main(int argc, char *argv[])
     trim_opt->required = NO;
     trim_opt->options = "0-50";
     trim_opt->description =
-	_
-	("Discard <trim> percent of the smallest and <trim> percent of the largest observations");
+	_("Discard <trim> percent of the smallest and <trim> percent of the largest observations");
     trim_opt->guisection = _("Statistic");
 
     scan_flag = G_define_flag();

raster/r.info/main.c

@@ -108,8 +108,7 @@ int main(int argc, char **argv)
     timestampflag = G_define_flag();
     timestampflag->key = 'p';
     timestampflag->description =
-	_
-	("Print raster map timestamp (day.month.year hour:minute:seconds) only");
+	_("Print raster map timestamp (day.month.year hour:minute:seconds) only");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

raster/r.le/r.le.setup/main.c

@@ -60,8 +60,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Interactive tool used to setup the sampling and analysis framework "
+	_("Interactive tool used to setup the sampling and analysis framework "
 	 "that will be used by the other r.le programs.");
 
     input = G_define_standard_option(G_OPT_R_MAP);

raster/r.le/r.le.trace/main.c

@@ -56,8 +56,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Displays the boundary of each r.le patch and shows how the boundary "
+	_("Displays the boundary of each r.le patch and shows how the boundary "
 	 "is traced, displays the attribute, size, perimeter and shape "
 	 "indices for each patch and saves the data in an output file.");
 

raster/r.li/r.li.edgedensity/edgedensity.c

@@ -35,8 +35,7 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     module->description =
-	_
-	("Calculates edge density index on a raster map, using a 4 neighbour algorithm");
+	_("Calculates edge density index on a raster map, using a 4 neighbour algorithm");
     module->keywords = _("raster, landscape structure analysis, patch index");
 
     /* define options */

raster/r.li/r.li.mps/mps.c

@@ -37,8 +37,7 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     module->description =
-	_
-	("Calculates mean patch size index on a raster map, using a 4 neighbour algorithm");
+	_("Calculates mean patch size index on a raster map, using a 4 neighbour algorithm");
     module->keywords = _("raster, landscape structure analysis, patch index");
     /* define options */
 

raster/r.li/r.li.padcv/padcv.c

@@ -34,8 +34,7 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     module->description =
-	_
-	("Calculates coefficient of variation of patch area on a raster map");
+	_("Calculates coefficient of variation of patch area on a raster map");
     module->keywords = _("raster, landscape structure analysis, patch index");
 
     /* define options */

raster/r.li/r.li.patchdensity/main.c

@@ -29,8 +29,7 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     module->description =
-	_
-	("Calculates patch density index on a raster map, using a 4 neighbour algorithm");
+	_("Calculates patch density index on a raster map, using a 4 neighbour algorithm");
     module->keywords = _("raster, landscape structure analysis, patch index");
 
     /* define options */

raster/r.li/r.li.patchnum/main.c

@@ -30,8 +30,7 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     module->description =
-	_
-	("Calculates patch number index on a raster map, using a 4 neighbour algorithm.");
+	_("Calculates patch number index on a raster map, using a 4 neighbour algorithm.");
     module->keywords = _("raster, landscape structure analysis, patch index");
 
     /* define options */

raster/r.null/null.c

@@ -79,8 +79,7 @@ int main(int argc, char *argv[])
     flags.n = G_define_flag();
     flags.n->key = 'n';
     flags.n->description =
-	_
-	("Only do the work if the map doesn't have a NULL-value bitmap file");
+	_("Only do the work if the map doesn't have a NULL-value bitmap file");
 
     flags.c = G_define_flag();
     flags.c->key = 'c';

raster/r.out.ascii/main.c

@@ -89,8 +89,7 @@ int main(int argc, char *argv[])
     parm.width->type = TYPE_INTEGER;
     parm.width->required = NO;
     parm.width->description =
-	_
-	("Number of values printed before wrapping a line (only SURFER or MODFLOW format)");
+	_("Number of values printed before wrapping a line (only SURFER or MODFLOW format)");
 
     parm.null = G_define_option();
     parm.null->key = "null";

raster/r.out.mpeg/main.c

@@ -422,8 +422,7 @@ static void parse_command(int argc, char *argv[],
     conv = G_define_flag();
     conv->key = 'c';
     conv->description =
-	_
-	("Convert on the fly, use less disk space\n\t(requires r.out.ppm with stdout option)");
+	_("Convert on the fly, use less disk space\n\t(requires r.out.ppm with stdout option)");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

raster/r.out.vrml/main.c

@@ -46,8 +46,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster, export, VRML");
     module->description =
-	_
-	("Export a raster map to the Virtual Reality Modeling Language (VRML)");
+	_("Export a raster map to the Virtual Reality Modeling Language (VRML)");
 
     rast_el = G_define_option();
     rast_el->key = "elev";

raster/r.out.vtk/parameters.c

@@ -63,8 +63,7 @@ void set_params()
     param.point = G_define_flag();
     param.point->key = 'p';
     param.point->description =
-	_
-	("Create VTK point data instead of VTK cell data (if no elevation map is given)");
+	_("Create VTK point data instead of VTK cell data (if no elevation map is given)");
 
     param.rgbmaps = G_define_option();
     param.rgbmaps->key = "rgbmaps";
@@ -74,8 +73,7 @@ void set_params()
     param.rgbmaps->multiple = YES;
     param.rgbmaps->guisection = "Advanced options";
     param.rgbmaps->description =
-	_
-	("Three (r,g,b) raster maps to create rgb values [redmap,greenmap,bluemap]");
+	_("Three (r,g,b) raster maps to create rgb values [redmap,greenmap,bluemap]");
 
     param.vectmaps = G_define_option();
     param.vectmaps->key = "vectormaps";
@@ -85,8 +83,7 @@ void set_params()
     param.vectmaps->multiple = YES;
     param.vectmaps->guisection = "Advanced options";
     param.vectmaps->description =
-	_
-	("Three (x,y,z) raster maps to create vector values [xmap,ymap,zmap]");
+	_("Three (x,y,z) raster maps to create vector values [xmap,ymap,zmap]");
 
     param.elevscale = G_define_option();
     param.elevscale->key = "elevscale";
@@ -123,8 +120,7 @@ void set_params()
     param.usevertices->key = 'v';
     param.usevertices->guisection = "Advanced options";
     param.usevertices->description =
-	_
-	("Use polydata-vertices for elevation grid creation (to use with vtkDelauny2D)");
+	_("Use polydata-vertices for elevation grid creation (to use with vtkDelauny2D)");
 
     param.origin = G_define_flag();
     param.origin->key = 'o';

raster/r.profile/main.c

@@ -48,8 +48,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Outputs the raster map layer values lying on user-defined line(s).");
+	_("Outputs the raster map layer values lying on user-defined line(s).");
 
     parm.opt1 = G_define_standard_option(G_OPT_R_INPUT);
 
@@ -87,8 +86,7 @@ int main(int argc, char *argv[])
     parm.g = G_define_flag();
     parm.g->key = 'g';
     parm.g->description =
-	_
-	("Output easting and northing in first two columns of four column output");
+	_("Output easting and northing in first two columns of four column output");
 
     parm.c = G_define_flag();
     parm.c->key = 'c';

raster/r.proj.seg/main.c

@@ -134,8 +134,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("raster, projection");
     module->description =
-	_
-	("Re-projects a raster map from one location to the current location.");
+	_("Re-projects a raster map from one location to the current location.");
 
     inmap = G_define_standard_option(G_OPT_R_INPUT);
     inmap->description = _("Name of input raster map to re-project");

raster/r.proj/main.c

@@ -128,8 +128,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("raster, projection");
     module->description =
-	_
-	("Re-projects a raster map from one location to the current location.");
+	_("Re-projects a raster map from one location to the current location.");
 
     inmap = G_define_standard_option(G_OPT_R_INPUT);
     inmap->description = _("Name of input raster map to re-project");

raster/r.reclass/main.c

@@ -102,8 +102,7 @@ int main(int argc, char *argv[])
 
     if (tty) {
 	fprintf(stdout,
-		_
-		("Enter rule(s), \"end\" when done, \"help\" if you need it\n"));
+		_("Enter rule(s), \"end\" when done, \"help\" if you need it\n"));
 	if (fp)
 	    fprintf(stdout, _("fp: Data range is %.25f to %.25f\n"),
 		    (double)min, (double)max);

raster/r.report/parse.c

@@ -42,8 +42,7 @@ int parse_command_line(int argc, char *argv[])
     parms.units->required = NO;
     parms.units->multiple = YES;
     parms.units->description =
-	_
-	("mi(les),me(ters),k(ilometers),a(cres),h(ectares),c(ell_counts),p(ercent_cover)");
+	_("mi(les),me(ters),k(ilometers),a(cres),h(ectares),c(ell_counts),p(ercent_cover)");
     parms.units->options = "mi,me,k,a,h,c,p";
 
     parms.nv = G_define_option();

raster/r.rescale.eq/main.c

@@ -64,8 +64,7 @@ int main(int argc, char *argv[])
     parm.from->type = TYPE_INTEGER;
     parm.from->required = NO;
     parm.from->description =
-	_
-	("The input data range to be rescaled (default: full range of input map)");
+	_("The input data range to be rescaled (default: full range of input map)");
 
     parm.output = G_define_option();
     parm.output->key = "output";

raster/r.rescale/main.c

@@ -60,8 +60,7 @@ int main(int argc, char *argv[])
     parm.from->type = TYPE_INTEGER;
     parm.from->required = NO;
     parm.from->description =
-	_
-	("The input data range to be rescaled (default: full range of input map)");
+	_("The input data range to be rescaled (default: full range of input map)");
 
     parm.output = G_define_option();
     parm.output->key = "output";

raster/r.slope.aspect/main.c

@@ -218,8 +218,7 @@ int main(int argc, char *argv[])
     parm.dx->answer = NULL;
     parm.dx->gisprompt = "new,cell,raster";
     parm.dx->description =
-	_
-	("Name for output first order partial derivative dx (E-W slope) raster map");
+	_("Name for output first order partial derivative dx (E-W slope) raster map");
     parm.dx->guisection = _("Advanced");
 
     parm.dy = G_define_option();
@@ -229,8 +228,7 @@ int main(int argc, char *argv[])
     parm.dy->answer = NULL;
     parm.dy->gisprompt = "new,cell,raster";
     parm.dy->description =
-	_
-	("Name for output first order partial derivative dy (N-S slope) raster map");
+	_("Name for output first order partial derivative dy (N-S slope) raster map");
     parm.dy->guisection = _("Advanced");
 
     parm.dxx = G_define_option();

raster/r.sun/main.c

@@ -175,8 +175,7 @@ int main(int argc, char *argv[])
     module->keywords = _("raster");
     module->label = _("Solar irradiance and irradiation model.");
     module->description =
-	_
-	("Computes direct (beam), diffuse and reflected solar irradiation raster "
+	_("Computes direct (beam), diffuse and reflected solar irradiation raster "
 	 "maps for given day, latitude, surface and atmospheric conditions. Solar "
 	 "parameters (e.g. sunrise, sunset times, declination, extraterrestrial "
 	 "irradiance, daylight length) are saved in the map history file. "
@@ -215,8 +214,7 @@ int main(int argc, char *argv[])
     parm.aspin->required = YES;
     parm.aspin->gisprompt = "old,cell,raster";
     parm.aspin->description =
-	_
-	("Name of the input aspect map (terrain aspect or azimuth of the solar panel) [decimal degrees]");
+	_("Name of the input aspect map (terrain aspect or azimuth of the solar panel) [decimal degrees]");
     parm.aspin->guisection = _("Input_options");
 
 
@@ -226,8 +224,7 @@ int main(int argc, char *argv[])
     parm.slopein->required = YES;
     parm.slopein->gisprompt = "old,cell,raster";
     parm.slopein->description =
-	_
-	("Name of the input slope raster map (terrain slope or solar panel inclination) [decimal degrees]");
+	_("Name of the input slope raster map (terrain slope or solar panel inclination) [decimal degrees]");
     parm.slopein->guisection = _("Input_options");
 
     parm.linkein = G_define_option();
@@ -236,8 +233,7 @@ int main(int argc, char *argv[])
     parm.linkein->required = NO;
     parm.linkein->gisprompt = "old,cell,raster";
     parm.linkein->description =
-	_
-	("Name of the Linke atmospheric turbidity coefficient input raster map [-]");
+	_("Name of the Linke atmospheric turbidity coefficient input raster map [-]");
     parm.linkein->guisection = _("Input_options");
 
     if (parm.linkein->answer == NULL) {
@@ -248,8 +244,7 @@ int main(int argc, char *argv[])
 	parm.lin->required = NO;
 	parm.lin->guisection = _("Input_options");
 	parm.lin->description =
-	    _
-	    ("A single value of the Linke atmospheric turbidity coefficient [-]");
+	    _("A single value of the Linke atmospheric turbidity coefficient [-]");
     }
 
     parm.albedo = G_define_option();
@@ -324,8 +319,7 @@ int main(int argc, char *argv[])
     parm.beam_rad->required = NO;
     parm.beam_rad->gisprompt = "new,cell,raster";
     parm.beam_rad->description =
-	_
-	("Output beam irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
+	_("Output beam irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
     parm.beam_rad->guisection = _("Output_options");
 
     parm.insol_time = G_define_option();
@@ -343,8 +337,7 @@ int main(int argc, char *argv[])
     parm.diff_rad->required = NO;
     parm.diff_rad->gisprompt = "new,cell,raster";
     parm.diff_rad->description =
-	_
-	("Output diffuse irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
+	_("Output diffuse irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
     parm.diff_rad->guisection = _("Output_options");
 
     parm.refl_rad = G_define_option();
@@ -353,8 +346,7 @@ int main(int argc, char *argv[])
     parm.refl_rad->required = NO;
     parm.refl_rad->gisprompt = "new,cell,raster";
     parm.refl_rad->description =
-	_
-	("Output ground reflected irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
+	_("Output ground reflected irradiance [W.m-2] (mode 1) or irradiation raster map [Wh.m-2.day-1] (mode 2)");
     parm.refl_rad->guisection = _("Output_options");
 
     parm.day = G_define_option();
@@ -376,8 +368,7 @@ int main(int argc, char *argv[])
     parm.declin->type = TYPE_DOUBLE;
     parm.declin->required = NO;
     parm.declin->description =
-	_
-	("Declination value (overriding the internally computed value) [radians]");
+	_("Declination value (overriding the internally computed value) [radians]");
 
     parm.ltime = G_define_option();
     parm.ltime->key = "time";

raster/r.sunmask/main.c

@@ -210,8 +210,7 @@ int main(int argc, char *argv[])
     parm.timezone->type = TYPE_INTEGER;
     parm.timezone->required = NO;
     parm.timezone->description =
-	_
-	("B: timezone (east positive, offset from GMT, also use to adjust daylight savings)");
+	_("B: timezone (east positive, offset from GMT, also use to adjust daylight savings)");
     parm.timezone->guisection = _("By_time");
 
     parm.east = G_define_option();

raster/r.to.rast3/main.c

@@ -278,8 +278,7 @@ int main(int argc, char *argv[])
 
 	if (maptype_tmp != globalRastMapType) {
 	    fatal_error(map, fd, opencells,
-			_
-			("Input maps have to be from the same type. CELL, FCELL or DCELL!"));
+			_("Input maps have to be from the same type. CELL, FCELL or DCELL!"));
 	}
     }
 

raster/r.to.rast3elev/main.c

@@ -399,8 +399,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster, raster3d, voxel, conversion");
     module->description =
-	_
-	("Creates a 3D volume map based on 2D elevation and value raster maps.");
+	_("Creates a 3D volume map based on 2D elevation and value raster maps.");
 
     /* Get parameters from user */
     set_params();

raster/r.to.vect/main.c

@@ -90,8 +90,7 @@ int main(int argc, char *argv[])
     value_flg = G_define_flag();
     value_flg->key = 'v';
     value_flg->description =
-	_
-	("Use raster values as categories instead of unique sequence (CELL only)");
+	_("Use raster values as categories instead of unique sequence (CELL only)");
 
     z_flg = G_define_flag();
     z_flg->key = 'z';
@@ -102,8 +101,7 @@ int main(int argc, char *argv[])
     no_topol = G_define_flag();
     no_topol->key = 'b';
     no_topol->description =
-	_
-	("Do not build vector topology (use with care for massive point export)");
+	_("Do not build vector topology (use with care for massive point export)");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

raster/r.topidx/main.c

@@ -40,8 +40,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Creates topographic index [ln(a/tan(beta))] map from elevation map.");
+	_("Creates topographic index [ln(a/tan(beta))] map from elevation map.");
 
     params.input = G_define_standard_option(G_OPT_R_INPUT);
     params.input->description = _("Input elevation map");

raster/r.transect/main.c

@@ -94,8 +94,7 @@ int main(int argc, char *argv[])
     coord = G_define_flag();
     coord->key = 'g';
     coord->description =
-	_
-	("Output easting and northing in first two columns of four column output");
+	_("Output easting and northing in first two columns of four column output");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

raster/r.univar2/r.univar_main.c

@@ -72,8 +72,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster, statistics");
     module->description =
-	_
-	("Calculates univariate statistics from the non-null cells of a raster map.");
+	_("Calculates univariate statistics from the non-null cells of a raster map.");
 
     /* Define the different options */
     set_params();

raster/r.univar2/r3.univar_main.c

@@ -76,8 +76,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster3d, statistics");
     module->description =
-	_
-	("Calculates univariate statistics from the non-null 3d cells of a raster3d map.");
+	_("Calculates univariate statistics from the non-null 3d cells of a raster3d map.");
 
     /* Define the different options */
     set_params();

raster/r.volume/main.c

@@ -66,8 +66,7 @@ int main(int argc, char *argv[])
     opt1->required = YES;
     opt1->gisprompt = "old,cell,raster";
     opt1->description =
-	_
-	("Existing raster map representing data that will be summed within clumps");
+	_("Existing raster map representing data that will be summed within clumps");
 
     opt2 = G_define_option();
     opt2->key = "clump";

raster/r.walk/main.c

@@ -295,8 +295,7 @@ int main(int argc, char *argv[])
     opt11->multiple = NO;
     opt11->answer = "1.0";
     opt11->description =
-	_
-	("Lambda coefficients for combining walking energy and friction cost");
+	_("Lambda coefficients for combining walking energy and friction cost");
 
     opt13 = G_define_option();
     opt13->key = "slope_factor";

raster/r.what/main.c

@@ -91,8 +91,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster");
     module->description =
-	_
-	("Queries raster map layers on their category values and category labels.");
+	_("Queries raster map layers on their category values and category labels.");
 
     opt1 = G_define_option();
     opt1->key = "input";

raster/simwe/r.sim.water/main.c

@@ -183,8 +183,7 @@ int main(int argc, char *argv[])
     parm.rain->key = "rain";
     parm.rain->required = NO;
     parm.rain->description =
-	_
-	("Name of the rainfall excess rate (rain-infilt) raster map [mm/hr]");
+	_("Name of the rainfall excess rate (rain-infilt) raster map [mm/hr]");
     parm.rain->guisection = _("Input_options");
 
     parm.rainval = G_define_option();
@@ -314,8 +313,7 @@ int main(int argc, char *argv[])
     parm.hmax->answer = HMAX;
     parm.hmax->required = NO;
     parm.hmax->description =
-	_
-	("Threshold water depth [m] (diffusion increases after this water depth is reached)");
+	_("Threshold water depth [m] (diffusion increases after this water depth is reached)");
     parm.hmax->guisection = _("Parameters");
 
     parm.halpha = G_define_option();

raster/wildfire/r.ros/main.c

@@ -278,8 +278,7 @@ int main(int argc, char *argv[])
     parm.aspect->type = TYPE_STRING;
     parm.aspect->gisprompt = "old,cell,raster";
     parm.aspect->description =
-	_
-	("Name of raster map containing ASPECT (degree, anti-clockwise from E)");
+	_("Name of raster map containing ASPECT (degree, anti-clockwise from E)");
 
     parm.elev = G_define_option();
     parm.elev->key = "elevation";

raster/wildfire/r.spread/main.c

@@ -102,8 +102,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster");
     module->label =
-	_
-	("Simulates elliptically anisotropic spread on a graphics window and "
+	_("Simulates elliptically anisotropic spread on a graphics window and "
 	 "generates a raster map of the cumulative time of spread, "
 	 "given raster maps containing the rates of spread (ROS), the ROS "
 	 "directions and the spread origins.");
@@ -153,8 +152,7 @@ int main(int argc, char *argv[])
     parm.spotdist->gisprompt = "old,cell,raster";
     parm.spotdist->guisection = _("Input_maps");
     parm.spotdist->description =
-	_
-	("Name of raster map containing max SPOTting DISTance (m) (required w/ -s)");
+	_("Name of raster map containing max SPOTting DISTance (m) (required w/ -s)");
 
     parm.velocity = G_define_option();
     parm.velocity->key = "w_speed";
@@ -162,8 +160,7 @@ int main(int argc, char *argv[])
     parm.velocity->gisprompt = "old,cell,raster";
     parm.velocity->guisection = _("Input_maps");
     parm.velocity->description =
-	_
-	("Name of raster map containing midflame Wind SPEED (ft/min) (required w/ -s)");
+	_("Name of raster map containing midflame Wind SPEED (ft/min) (required w/ -s)");
 
     parm.mois = G_define_option();
     parm.mois->key = "f_mois";
@@ -171,8 +168,7 @@ int main(int argc, char *argv[])
     parm.mois->gisprompt = "old,cell,raster";
     parm.mois->guisection = _("Input_maps");
     parm.mois->description =
-	_
-	("Name of raster map containing fine Fuel MOISture of the cell receiving a spotting firebrand (%) (required w/ -s)");
+	_("Name of raster map containing fine Fuel MOISture of the cell receiving a spotting firebrand (%) (required w/ -s)");
 
     parm.least = G_define_option();
     parm.least->key = "least_size";
@@ -187,8 +183,7 @@ int main(int argc, char *argv[])
     parm.comp_dens->type = TYPE_STRING;
     parm.comp_dens->key_desc = "decimal";
     parm.comp_dens->description =
-	_
-	("Sampling DENSity for additional COMPutin (range: 0.0 - 1.0 (0.5))");
+	_("Sampling DENSity for additional COMPutin (range: 0.0 - 1.0 (0.5))");
 
     parm.init_time = G_define_option();
     parm.init_time->key = "init_time";
@@ -415,8 +410,7 @@ int main(int argc, char *argv[])
     }
     if (G_find_cell2(out_layer, G_mapset())) {
 	sprintf(buf,
-		_
-		("Raster map <%s> already exists in mapset <%s>, select another name"),
+		_("Raster map <%s> already exists in mapset <%s>, select another name"),
 		out_layer, G_mapset());
 	G_fatal_error(buf);
 	exit(EXIT_FAILURE);
@@ -430,8 +424,7 @@ int main(int argc, char *argv[])
 	}
 	if (G_find_cell2(x_out_layer, G_mapset())) {
 	    sprintf(buf,
-		    _
-		    ("Raster map <%s> already exists in mapset <%s>, select another name"),
+		    _("Raster map <%s> already exists in mapset <%s>, select another name"),
 		    x_out_layer, G_mapset());
 	    G_fatal_error(buf);
 	    exit(EXIT_FAILURE);
@@ -446,8 +439,7 @@ int main(int argc, char *argv[])
 	}
 	if (G_find_cell2(y_out_layer, G_mapset())) {
 	    sprintf(buf,
-		    _
-		    ("Raster map <%s> already exists in mapset <%s>, select another name"),
+		    _("Raster map <%s> already exists in mapset <%s>, select another name"),
 		    y_out_layer, G_mapset());
 	    G_fatal_error(buf);
 	    exit(EXIT_FAILURE);

raster3d/base/r3.info.main.c

@@ -77,8 +77,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster3d, voxel");
     module->description =
-	_
-	("Outputs basic information about a user-specified 3D raster map layer.");
+	_("Outputs basic information about a user-specified 3D raster map layer.");
 
     opt1 = G_define_option();
     opt1->key = "map";
@@ -111,8 +110,7 @@ int main(int argc, char *argv[])
     timestampflag = G_define_flag();
     timestampflag->key = 'p';
     timestampflag->description =
-	_
-	("Print 3D raster map timestamp (day.month.year hour:minute:seconds) only");
+	_("Print 3D raster map timestamp (day.month.year hour:minute:seconds) only");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

raster3d/r3.cross.rast/main.c

@@ -269,8 +269,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster3d, voxel");
     module->description =
-	_
-	("Creates cross section 2D raster map from 3d raster map based on 2D elevation map");
+	_("Creates cross section 2D raster map from 3d raster map based on 2D elevation map");
 
     /* Get parameters from user */
     set_params();

raster3d/r3.gwflow/main.c

@@ -60,8 +60,7 @@ void set_params(void)
     param.status->required = YES;
     param.status->gisprompt = "old,grid3,3d-raster";
     param.status->description =
-	_
-	("The status for each cell, = 0 - inactive, 1 - active, 2 - dirichlet");
+	_("The status for each cell, = 0 - inactive, 1 - active, 2 - dirichlet");
 
     param.hc_x = G_define_option();
     param.hc_x->key = "hc_x";
@@ -114,8 +113,7 @@ void set_params(void)
     param.output->required = YES;
     param.output->gisprompt = "new,grid3,3d-raster";
     param.output->description =
-	_
-	("The piezometric head result of the numerical calculation will be written to this map");
+	_("The piezometric head result of the numerical calculation will be written to this map");
 
     param.vector = G_define_option();
     param.vector->key = "velocity";
@@ -123,8 +121,7 @@ void set_params(void)
     param.vector->required = NO;
     param.vector->gisprompt = "new,grid3,3d-raster";
     param.vector->description =
-	_
-	("Calculate the groundwater distance velocity vector field and write the x, y, and z components to maps named name_[xyz]. Name is basename for the new raster3d maps");
+	_("Calculate the groundwater distance velocity vector field and write the x, y, and z components to maps named name_[xyz]. Name is basename for the new raster3d maps");
 
 
     param.dt = N_define_standard_option(N_OPT_CALC_TIME);
@@ -140,8 +137,7 @@ void set_params(void)
     param.sparse = G_define_flag();
     param.sparse->key = 's';
     param.sparse->description =
-	_
-	("Use a sparse linear equation system, only available with iterative solvers");
+	_("Use a sparse linear equation system, only available with iterative solvers");
 }
 
 /* ************************************************************************* */
@@ -171,8 +167,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster3d, voxel");
     module->description =
-	_
-	("Numerical calculation program for transient, confined groundwater flow in three dimensions");
+	_("Numerical calculation program for transient, confined groundwater flow in three dimensions");
 
     /* Get parameters from user */
     set_params();

raster3d/r3.in.ascii/main.c

@@ -87,8 +87,7 @@ static void setParams()
     param.nv->multiple = NO;
     param.nv->answer = "none";
     param.nv->description =
-	_
-	("String representing NULL value data cell (use 'none' if no such value)");
+	_("String representing NULL value data cell (use 'none' if no such value)");
 }
 
 /*---------------------------------------------------------------------------*/
@@ -240,8 +239,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster3d, voxel, import");
     module->description =
-	_
-	("Convert a 3D ASCII raster text file into a (binary) 3D raster map layer");
+	_("Convert a 3D ASCII raster text file into a (binary) 3D raster map layer");
 
     setParams();
     G3d_setStandard3dInputParams();

raster3d/r3.mkdspf/main.c

@@ -77,8 +77,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("raster3d, voxel");
     module->description =
-	_
-	("Creates a display file from an existing grid3 file according to specified threshold levels.");
+	_("Creates a display file from an existing grid3 file according to specified threshold levels.");
 
     name = G_define_option();
     name->key = "input";

raster3d/r3.out.vtk/parameters.c

@@ -44,8 +44,7 @@ void set_params()
     param.point = G_define_flag();
     param.point->key = 'p';
     param.point->description =
-	_
-	("Create VTK pointdata instead of VTK celldata (celldata is default)");
+	_("Create VTK pointdata instead of VTK celldata (celldata is default)");
 
     param.top = G_define_option();
     param.top->key = "top";
@@ -69,8 +68,7 @@ void set_params()
     param.structgrid->key = 's';
     param.structgrid->guisection = "Surface options";
     param.structgrid->description =
-	_
-	("Create 3d elevation output with a top and a bottom surface, both raster maps are required.");
+	_("Create 3d elevation output with a top and a bottom surface, both raster maps are required.");
 
 
     param.rgbmaps = G_define_option();
@@ -81,8 +79,7 @@ void set_params()
     param.rgbmaps->multiple = YES;
     param.rgbmaps->guisection = "Advanced options";
     param.rgbmaps->description =
-	_
-	("Three (r,g,b) 3d raster maps to create rgb values [redmap,greenmap,bluemap]");
+	_("Three (r,g,b) 3d raster maps to create rgb values [redmap,greenmap,bluemap]");
 
     param.vectormaps = G_define_option();
     param.vectormaps->key = "vectormaps";
@@ -92,8 +89,7 @@ void set_params()
     param.vectormaps->multiple = YES;
     param.vectormaps->guisection = "Advanced options";
     param.vectormaps->description =
-	_
-	("Three (x,y,z) 3d raster maps to create vector values [xmap,ymap,zmap]");
+	_("Three (x,y,z) 3d raster maps to create vector values [xmap,ymap,zmap]");
 
 
     param.elevscale = G_define_option();

raster3d/r3.out.vtk/writeVTKData.c

@@ -331,8 +331,7 @@ void write_vtk_data(FILE * fp, void *map, G3D_Region region, char *varname,
     }
 
     G_debug(3,
-	    _
-	    ("write_vtk_data: Writing Celldata %s with rows %i cols %i depths %i to vtk-ascii file"),
+	    _("write_vtk_data: Writing Celldata %s with rows %i cols %i depths %i to vtk-ascii file"),
 	    varname, rows, cols, depths);
 
     fprintf(fp, "SCALARS %s float 1\n", varname);

raster3d/r3.out.vtk/writeVTKHead.c

@@ -36,8 +36,7 @@ void write_vtk_structured_point_header(FILE * fp, char *vtkFile,
 				       double scale)
 {
     G_debug(3,
-	    _
-	    ("write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"));
+	    _("write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"));
 
     /*Simple vtk ASCII header */
 
@@ -93,8 +92,7 @@ void write_vtk_structured_grid_header(FILE * fp, char *vtkFile,
 				      G3D_Region region)
 {
     G_debug(3,
-	    _
-	    ("write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header"));
+	    _("write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header"));
     fprintf(fp, "# vtk DataFile Version 3.0\n");
     fprintf(fp, "GRASS 6 Export\n");
     fprintf(fp, "ASCII\n");
@@ -115,8 +113,7 @@ void write_vtk_unstructured_grid_header(FILE * fp, char *vtkFile,
 					G3D_Region region)
 {
     G_debug(3,
-	    _
-	    ("write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"));
+	    _("write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"));
     fprintf(fp, "# vtk DataFile Version 3.0\n");
     fprintf(fp, "GRASS 6 Export\n");
     fprintf(fp, "ASCII\n");

vector/lidar/v.lidar.correction/main.c

@@ -63,8 +63,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("vector, LIDAR");
     module->description =
-	_
-	("Correction of the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering.");
+	_("Correction of the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering.");
 
     in_opt = G_define_standard_option(G_OPT_V_INPUT);
     in_opt->description =

vector/lidar/v.lidar.edgedetection/main.c

@@ -339,8 +339,7 @@ int main(int argc, char *argv[])
 
 		if (flag_auxiliar == FALSE) {
 		    G_debug(1,
-			    _
-			    ("Creating auxiliar table for archiving overlaping zones"));
+			    _("Creating auxiliar table for archiving overlaping zones"));
 		    if ((flag_auxiliar =
 			 Create_AuxEdge_Table(driver)) == FALSE)
 			G_fatal_error(_("It was impossible to create <%s>."),

vector/lidar/v.surf.bspline/crosscorr.c

@@ -304,12 +304,10 @@ int cross_correlation(struct Map_info *Map, double passWE, double passNS)
 
 	/* Writing some output */
 	fprintf(stdout,
-		_
-		("CrossCorrelation: Different number of splines and lambda_i values have "
+		_("CrossCorrelation: Different number of splines and lambda_i values have "
 		 "been taken for the cross correlation\n"));
 	fprintf(stdout,
-		_
-		("CrossCorrelation: The minimum value for the test (rms=%lf) was obtained with:\n"),
+		_("CrossCorrelation: The minimum value for the test (rms=%lf) was obtained with:\n"),
 		rms_min);
 	fprintf(stdout, _("CrossCorrelation: lambda_i = %.3f\n"),
 		lambda[lbd_min]);

vector/lidar/v.surf.bspline/main.c

@@ -76,8 +76,7 @@ int main(int argc, char *argv[])
     module = G_define_module(); {
 	module->keywords = _("vector, interpolation");
 	module->description =
-	    _
-	    ("Bicubic or bilinear spline interpolation with Tykhonov regularization.");
+	    _("Bicubic or bilinear spline interpolation with Tykhonov regularization.");
     }
 
     cross_corr_flag = G_define_flag(); {
@@ -143,8 +142,7 @@ int main(int argc, char *argv[])
 
     dfield_opt = G_define_standard_option(G_OPT_V_FIELD); {
 	dfield_opt->description =
-	    _
-	    ("Field value. If set to 0, z coordinates are used. (3D vector only)");
+	    _("Field value. If set to 0, z coordinates are used. (3D vector only)");
 	dfield_opt->answer = "0";
 	dfield_opt->guisection = _("Settings");
     }
@@ -154,8 +152,7 @@ int main(int argc, char *argv[])
 	col_opt->type = TYPE_STRING;
 	col_opt->required = NO;
 	col_opt->description =
-	    _
-	    ("Attribute table column with values to interpolate (if layer>0)");
+	    _("Attribute table column with values to interpolate (if layer>0)");
 	col_opt->guisection = _("Settings");
     }
 

vector/v.buffer/main.c

@@ -253,8 +253,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("vector");
     module->description =
-	_
-	("Creates a buffer around features of given type (areas must contain centroid).");
+	_("Creates a buffer around features of given type (areas must contain centroid).");
 
     in_opt = G_define_standard_option(G_OPT_V_INPUT);
     out_opt = G_define_standard_option(G_OPT_V_OUTPUT);

vector/v.build/main.c

@@ -39,8 +39,7 @@ int main(int argc, char *argv[])
     err_opt = G_define_standard_option(G_OPT_V_OUTPUT);
     err_opt->key = "error";
     err_opt->description =
-	_
-	("Name for vector map where erroneous vector features are written to");
+	_("Name for vector map where erroneous vector features are written to");
     err_opt->required = NO;
 
     opt = G_define_option();

vector/v.db.connect/main.c

@@ -166,8 +166,7 @@ int main(int argc, char **argv)
 		    }
 		    else {
 			fprintf(stdout,
-				_
-				("layer <%d> table <%s> in database <%s> through driver "
+				_("layer <%d> table <%s> in database <%s> through driver "
 				 "<%s> with key <%s>\n"), fi->number,
 				fi->table, fi->database, fi->driver, fi->key);
 		    }

vector/v.digit/main.c

@@ -157,8 +157,7 @@ int main(int argc, char *argv[])
     bgcmd_opt->multiple = NO;
     bgcmd_opt->answer = "";
     bgcmd_opt->description =
-	_
-	("Display commands to be used for canvas backdrop (separated by ';')");
+	_("Display commands to be used for canvas backdrop (separated by ';')");
 
     new_f = G_define_flag();
     new_f->key = 'n';

vector/v.distance/main.c

@@ -114,8 +114,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("vector, database, attribute table");
     module->description =
-	_
-	("Finds the nearest element in vector map 'to' for elements in vector map 'from'.");
+	_("Finds the nearest element in vector map 'to' for elements in vector map 'from'.");
 
     from_opt = G_define_standard_option(G_OPT_V_INPUT);
     from_opt->key = "from";
@@ -191,8 +190,7 @@ int main(int argc, char *argv[])
     column_opt->required = YES;
     column_opt->multiple = YES;
     column_opt->description =
-	_
-	("Column name(s) where values specified by 'upload' option will be uploaded");
+	_("Column name(s) where values specified by 'upload' option will be uploaded");
     column_opt->guisection = _("From_map");
 
     to_column_opt = G_define_standard_option(G_OPT_COLUMN);
@@ -203,16 +201,14 @@ int main(int argc, char *argv[])
 
     table_opt = G_define_standard_option(G_OPT_TABLE);
     table_opt->description =
-	_
-	("Name of table created for output when the distance to all flag is used");
+	_("Name of table created for output when the distance to all flag is used");
 
     print_flag = G_define_flag();
     print_flag->key = 'p';
     print_flag->label =
 	_("Print output to stdout, don't update attribute table");
     print_flag->description =
-	_
-	("First column is always category of 'from' feature called from_cat");
+	_("First column is always category of 'from' feature called from_cat");
 
     all_flag = G_define_flag();
     all_flag->key = 'a';

vector/v.edit/args.c

@@ -185,8 +185,7 @@ int parser(int argc, char *argv[], struct GParams *params,
     params->snap->type = TYPE_STRING;
     params->snap->options = "no,node,vertex";
     params->snap->description =
-	_
-	("Snap added or modified features in the given threshold to the nearest existing feature");
+	_("Snap added or modified features in the given threshold to the nearest existing feature");
     params->snap->descriptions =
 	_("no;Not apply snapping;" "node;Snap only to node;"
 	  "vertex;Allow snapping also to vertex");

vector/v.external/main.c

@@ -80,8 +80,7 @@ int main(int argc, char *argv[])
     layer_opt->required = NO;
     layer_opt->multiple = NO;
     layer_opt->description =
-	_
-	("OGR layer name. If not given, available layers are printed only. Examples:\n"
+	_("OGR layer name. If not given, available layers are printed only. Examples:\n"
 	 "\t\tESRI Shapefile: shapefile name\n"
 	 "\t\tMapInfo File: mapinfo file name");
 

vector/v.extract/main.c

@@ -108,8 +108,7 @@ int main(int argc, char **argv)
     newopt->required = NO;
     newopt->answer = "-1";
     newopt->label =
-	_
-	("Enter -1 to keep original categories or the desired NEW category value");
+	_("Enter -1 to keep original categories or the desired NEW category value");
     newopt->description = _("If new >= 0, table is not copied");
 
     listopt = G_define_standard_option(G_OPT_V_CATS);
@@ -119,8 +118,7 @@ int main(int argc, char **argv)
     fileopt->key = "file";
     fileopt->required = NO;
     fileopt->label =
-	_
-	("Input text file with category numbers/number ranges to be extracted");
+	_("Input text file with category numbers/number ranges to be extracted");
     fileopt->description = _("If '-' given reads from standard input");
 
     whereopt = G_define_standard_option(G_OPT_WHERE);

vector/v.generalize/main.c

@@ -76,8 +76,7 @@ int main(int argc, char *argv[])
     /* initialize module */
     module = G_define_module();
     module->keywords =
-	_
-	("vector, generalization, simplification, smoothing, displacement, network generalization");
+	_("vector, generalization, simplification, smoothing, displacement, network generalization");
     module->description = _("Vector based generalization.");
 
     /* Define the different options as defined in gis.h */
@@ -135,8 +134,7 @@ int main(int argc, char *argv[])
     reduction_opt->answer = "50";
     reduction_opt->options = "0-100";
     reduction_opt->description =
-	_
-	("Percentage of the points in the output of 'douglas_reduction' algorithm");
+	_("Percentage of the points in the output of 'douglas_reduction' algorithm");
 
     slide_opt = G_define_option();
     slide_opt->key = "slide";

vector/v.hull/main.c

@@ -287,8 +287,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("vector, geometry");
     module->description =
-	_
-	("Uses a GRASS vector points map to produce a convex hull vector map.");
+	_("Uses a GRASS vector points map to produce a convex hull vector map.");
 
     input = G_define_standard_option(G_OPT_V_INPUT);
     input->description = _("Name of input vector points map");

vector/v.in.ascii/in.c

@@ -47,15 +47,13 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("vector, import");
     module->description =
-	_
-	("Creates a vector map from ASCII points file or ASCII vector file.");
+	_("Creates a vector map from ASCII points file or ASCII vector file.");
 
     /************************** Command Parser ************************************/
     old = G_define_standard_option(G_OPT_F_INPUT);
     old->required = NO;
     old->description =
-	_
-	("ASCII file to be imported, if not given reads from standard input");
+	_("ASCII file to be imported, if not given reads from standard input");
     old->guisection = _("Required");
 
     new = G_define_standard_option(G_OPT_V_OUTPUT);
@@ -80,8 +78,7 @@ int main(int argc, char *argv[])
     skip_opt->multiple = NO;
     skip_opt->answer = "0";
     skip_opt->description =
-	_
-	("Number of header lines to skip at top of input file (points mode)");
+	_("Number of header lines to skip at top of input file (points mode)");
 
     columns_opt = G_define_standard_option(G_OPT_COLUMNS);
     columns_opt->multiple = NO;
@@ -99,8 +96,7 @@ int main(int argc, char *argv[])
     xcol_opt->answer = "1";
     xcol_opt->guisection = _("Columns");
     xcol_opt->description =
-	_
-	("Number of column used as x coordinate (first column is 1) for points mode");
+	_("Number of column used as x coordinate (first column is 1) for points mode");
 
     ycol_opt = G_define_option();
     ycol_opt->key = "y";
@@ -110,8 +106,7 @@ int main(int argc, char *argv[])
     ycol_opt->answer = "2";
     ycol_opt->guisection = _("Columns");
     ycol_opt->description =
-	_
-	("Number of column used as y coordinate (first column is 1) for points mode");
+	_("Number of column used as y coordinate (first column is 1) for points mode");
 
     zcol_opt = G_define_option();
     zcol_opt->key = "z";
@@ -133,11 +128,9 @@ int main(int argc, char *argv[])
     catcol_opt->answer = "0";
     catcol_opt->guisection = _("Columns");
     catcol_opt->label =
-	_
-	("Number of column used as category (first column is 1) for points mode");
+	_("Number of column used as category (first column is 1) for points mode");
     catcol_opt->description =
-	_
-	("If 0, unique category is assigned to each row and written to new column 'cat'");
+	_("If 0, unique category is assigned to each row and written to new column 'cat'");
 
     zcoorf = G_define_flag();
     zcoorf->key = 'z';
@@ -146,8 +139,7 @@ int main(int argc, char *argv[])
     e_flag = G_define_flag();
     e_flag->key = 'e';
     e_flag->description =
-	_
-	("Create a new empty vector map and exit. Nothing is read from input");
+	_("Create a new empty vector map and exit. Nothing is read from input");
 
     noheader_flag = G_define_flag();
     noheader_flag->key = 'n';

vector/v.in.db/main.c

@@ -51,8 +51,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("vector, import");
     module->description =
-	_
-	("Creates new vector (points) map from database table containing coordinates.");
+	_("Creates new vector (points) map from database table containing coordinates.");
 
     table_opt = G_define_standard_option(G_OPT_TABLE);
     table_opt->required = YES;

vector/v.in.ogr/main.c

@@ -575,12 +575,10 @@ int main(int argc, char *argv[])
 		}
 	    }
 	    sprintf(error_msg + strlen(error_msg),
-		    _
-		    ("\nYou can use the -o flag to %s to override this projection check.\n"),
+		    _("\nYou can use the -o flag to %s to override this projection check.\n"),
 		    G_program_name());
 	    strcat(error_msg,
-		   _
-		   ("Consider generating a new location with 'location' parameter"
+		   _("Consider generating a new location with 'location' parameter"
 		    " from input data set.\n"));
 	    G_fatal_error(error_msg);
 	}

vector/v.info/main.c

@@ -63,8 +63,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     module->keywords = _("vector");
     module->description =
-	_
-	("Outputs basic information about a user-specified vector map layer.");
+	_("Outputs basic information about a user-specified vector map layer.");
 
     /* get G_OPT_ from include/gis.h */
     in_opt = G_define_standard_option(G_OPT_V_MAP);
@@ -78,8 +77,7 @@ int main(int argc, char *argv[])
     columns = G_define_flag();
     columns->key = 'c';
     columns->description =
-	_
-	("Print types/names of table columns for specified layer instead of info");
+	_("Print types/names of table columns for specified layer instead of info");
 
     gflag = G_define_flag();
     gflag->key = 'g';
@@ -254,26 +252,22 @@ int main(int argc, char *argv[])
 	    if (Vect_level(&Map) > 1) {
 		printline("");
 		sprintf(line,
-			_
-			("  Number of points:       %-9ld       Number of areas:      %-9ld"),
+			_("  Number of points:       %-9ld       Number of areas:      %-9ld"),
 			(long)Vect_get_num_primitives(&Map, GV_POINT),
 			(long)Vect_get_num_areas(&Map));
 		printline(line);
 		sprintf(line,
-			_
-			("  Number of lines:        %-9ld       Number of islands:    %-9ld"),
+			_("  Number of lines:        %-9ld       Number of islands:    %-9ld"),
 			(long)Vect_get_num_primitives(&Map, GV_LINE),
 			(long)Vect_get_num_islands(&Map));
 		printline(line);
 		sprintf(line,
-			_
-			("  Number of boundaries:   %-9ld       Number of faces:      %-9ld"),
+			_("  Number of boundaries:   %-9ld       Number of faces:      %-9ld"),
 			(long)Vect_get_num_primitives(&Map, GV_BOUNDARY),
 			(long)Vect_get_num_primitives(&Map, GV_FACE));
 		printline(line);
 		sprintf(line,
-			_
-			("  Number of centroids:    %-9ld       Number of kernels:    %-9ld"),
+			_("  Number of centroids:    %-9ld       Number of kernels:    %-9ld"),
 			(long)Vect_get_num_primitives(&Map, GV_CENTROID),
 			(long)Vect_get_num_primitives(&Map, GV_KERNEL));
 		printline(line);