fixed unlucky formatted messages (thanks to Glynn)

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

display/d.barscale/main.c

@@ -111,8 +111,7 @@ int main(int argc, char **argv)
 
     G_get_window(&W);
     if (W.proj == PROJECTION_LL && !northarrow->answer)
-	G_fatal_error(_
-		      ("%s does not work with a latitude-longitude location"),
+	G_fatal_error(_("%s does not work with a latitude-longitude location"),
 		      argv[0]);
 
     if (linescale->answer)

display/d.extract/extract.c

@@ -43,8 +43,7 @@ int extract(struct Map_info *In, struct Map_info *Out, int type,
     mode = M_START;
     G_message(_("Select vector(s) with mouse"));
     G_message(_(" - L: draw box with left mouse button to select"));
-    G_message(_
-	      (" - M: draw box with middle mouse button to remove from display"));
+    G_message(_(" - M: draw box with middle mouse button to remove from display"));
     G_message(_(" - R: quit and save selected vectors to new map\n"));
     while (1) {
 	G_message(_("L: add  M: remove  R: quit and save\n"));

display/d.font/main.c

@@ -123,8 +123,7 @@ int main(int argc, char **argv)
 	    i++;
 	}
 	if (i >= num_fonts)
-	    G_fatal_error(_
-			  ("Font name <%s> is invalid. Check font name or consider running 'g.mkfontcap'"),
+	    G_fatal_error(_("Font name <%s> is invalid. Check font name or consider running 'g.mkfontcap'"),
 			  opt1->answer);
     }
 

display/d.grid/main.c

@@ -134,11 +134,9 @@ int main(int argc, char **argv)
     if (wgs84->answer)
 	geogrid->answer = 1;	/* -w implies -g */
     if (geogrid->answer && G_projection() == PROJECTION_LL)
-	G_fatal_error(_
-		      ("Geo-Grid option is not available for LL projection"));
+	G_fatal_error(_("Geo-Grid option is not available for LL projection"));
     if (geogrid->answer && G_projection() == PROJECTION_XY)
-	G_fatal_error(_
-		      ("Geo-Grid option is not available for XY projection"));
+	G_fatal_error(_("Geo-Grid option is not available for XY projection"));
 
     if (notext->answer)
 	do_text = FALSE;

display/d.grid/plot.c

@@ -291,16 +291,14 @@ void init_proj(struct pj_info *info_in, struct pj_info *info_out, int wgs84)
     out_proj_keys = G_get_projinfo();
     out_unit_keys = G_get_projunits();
     if (pj_get_kv(info_out, out_proj_keys, out_unit_keys) < 0)
-	G_fatal_error(_
-		      ("Can't get projection key values of current location"));
+	G_fatal_error(_("Can't get projection key values of current location"));
 
     /* In Info */
     if (!wgs84) {
 	/* Set lat/long to same ellipsoid as location if we're not looking
 	 * for the WGS84 values */
 	if (GPJ_get_equivalent_latlong(info_in, info_out) < 0)
-	    G_fatal_error(_
-			  ("Unable to set up lat/long projection parameters"));
+	    G_fatal_error(_("Unable to set up lat/long projection parameters"));
 
     }
     else {
@@ -314,8 +312,7 @@ void init_proj(struct pj_info *info_in, struct pj_info *info_out, int wgs84)
 	 * the WGS84 values would be meaningless), and if they are set the 
 	 * input datum to WGS84 */
 	if (G_get_datumparams_from_projinfo(out_proj_keys, buff, dum) < 0)
-	    G_fatal_error(_
-			  ("WGS84 grid output not possible as this location does not contain\n"
+	    G_fatal_error(_("WGS84 grid output not possible as this location does not contain\n"
 			   "datum transformation parameters. Try running g.setproj."));
 	else
 	    G_set_key_value("datum", "wgs84", in_proj_info);
@@ -328,8 +325,7 @@ void init_proj(struct pj_info *info_in, struct pj_info *info_out, int wgs84)
 	G_set_key_value("meters", "1.0", in_unit_info);
 
 	if (pj_get_kv(info_in, in_proj_info, in_unit_info) < 0)
-	    G_fatal_error(_
-			  ("Unable to set up lat/long projection parameters"));
+	    G_fatal_error(_("Unable to set up lat/long projection parameters"));
 
 	G_free_key_value(in_proj_info);
 	G_free_key_value(in_unit_info);

display/d.labels/main.c

@@ -98,8 +98,7 @@ int main(int argc, char **argv)
     if (minreg_opt->answer) {
 	minreg = atof(minreg_opt->answer);
 	if (reg < minreg) {
-	    G_warning(_
-		      ("Region size is lower than minreg, nothing displayed."));
+	    G_warning(_("Region size is lower than minreg, nothing displayed."));
 	    R_close_driver();
 	    exit(0);
 	}
@@ -107,8 +106,7 @@ int main(int argc, char **argv)
     if (maxreg_opt->answer) {
 	maxreg = atof(maxreg_opt->answer);
 	if (reg > maxreg) {
-	    G_warning(_
-		      ("Region size is greater than maxreg, nothing displayed."));
+	    G_warning(_("Region size is greater than maxreg, nothing displayed."));
 	    R_close_driver();
 	    exit(0);
 	}

display/d.legend/main.c

@@ -311,8 +311,7 @@ int main(int argc, char **argv)
 	y1++;
 
     if ((x0 < l) || (x1 > r) || (y0 < t) || (y1 > b))	/* for mouse or at= 0- or 100+; needs to be after order check */
-	G_warning(_
-		  ("Legend box lies outside of frame. Text may not display properly."));
+	G_warning(_("Legend box lies outside of frame. Text may not display properly."));
 
     horiz = (x1 - x0 > y1 - y0);
     if (horiz)
@@ -327,8 +326,7 @@ int main(int argc, char **argv)
     /* How many categories to show */
     if (!fp) {
 	if (G_read_range(map_name, mapset, &range) == -1)
-	    G_fatal_error(_
-			  ("Range information for <%s> not available (run r.support)"),
+	    G_fatal_error(_("Range information for <%s> not available (run r.support)"),
 			  map_name);
 
 	G_get_range_min_max(&range, &min_ind, &max_ind);
@@ -344,15 +342,13 @@ int main(int argc, char **argv)
 		min_ind =
 		    UserRangeMin <
 		    min_colr ? min_colr : (int)ceil(UserRangeMin);
-		G_warning(_
-			  ("Color range exceeds lower limit of actual data"));
+		G_warning(_("Color range exceeds lower limit of actual data"));
 	    }
 	    if (max_ind < UserRangeMax) {
 		max_ind =
 		    UserRangeMax >
 		    max_colr ? max_colr : (int)floor(UserRangeMax);
-		G_warning(_
-			  ("Color range exceeds upper limit of actual data"));
+		G_warning(_("Color range exceeds upper limit of actual data"));
 	    }
 	}
 
@@ -409,8 +405,7 @@ int main(int argc, char **argv)
 	    maxCat = 0;		/* reset */
 	    for (i = 0, k = 0; i < catlistCount; i++) {
 		if ((catlist[i] < min_ind) || (catlist[i] > max_ind)) {
-		    G_fatal_error(_
-				  ("use=%s out of range [%d,%d] (extend with range= ?)"),
+		    G_fatal_error(_("use=%s out of range [%d,%d] (extend with range= ?)"),
 				  opt8->answers[i], min_ind, max_ind);
 		}
 
@@ -451,8 +446,7 @@ int main(int argc, char **argv)
 	/* following covers both the above if(do_cats == cats_num) and k++ loop */
 	if (lines < 1) {
 	    lines = 1;		/* ward off the dpl floating point exception */
-	    G_fatal_error(_
-			  ("Nothing to draw! (no categories with labels? out of range?)"));
+	    G_fatal_error(_("Nothing to draw! (no categories with labels? out of range?)"));
 	}
 
 	/* Figure number of lines, number of pixles per line and text size */
@@ -462,8 +456,7 @@ int main(int argc, char **argv)
 	/*  an alternate solution is to set   dots_per_line=1         */
 	if ((dots_per_line == 0) && (do_smooth == 0)) {
 	    if (!use_catlist) {
-		G_message(_
-			  ("Forcing a smooth legend: too many categories for current window height"));
+		G_message(_("Forcing a smooth legend: too many categories for current window height"));
 		do_smooth = 1;
 	    }
 	}
@@ -507,21 +500,18 @@ int main(int argc, char **argv)
 		dmax = UserRangeMax;
 	    if (dmin > UserRangeMin) {
 		dmin = UserRangeMin < min_dcolr ? min_dcolr : UserRangeMin;
-		G_warning(_
-			  ("Color range exceeds lower limit of actual data"));
+		G_warning(_("Color range exceeds lower limit of actual data"));
 	    }
 	    if (dmax < UserRangeMax) {
 		dmax = UserRangeMax > max_dcolr ? max_dcolr : UserRangeMax;
-		G_warning(_
-			  ("Color range exceeds upper limit of actual data"));
+		G_warning(_("Color range exceeds upper limit of actual data"));
 	    }
 	}
 
 	if (use_catlist) {
 	    for (i = 0; i < catlistCount; i++) {
 		if ((catlist[i] < dmin) || (catlist[i] > dmax)) {
-		    G_fatal_error(_
-				  ("use=%s out of range [%.3f, %.3f] (extend with range= ?)"),
+		    G_fatal_error(_("use=%s out of range [%.3f, %.3f] (extend with range= ?)"),
 				  opt8->answers[i], dmin, dmax);
 		}
 		if (strlen(opt8->answers[i]) > MaxLabelLen)

display/d.linegraph/linegraph.c

@@ -288,8 +288,7 @@ int main(int argc, char **argv)
 	    }
 	}
 	if ((i > 0) && (in[0].num_pnts != in[i].num_pnts)) {
-	    G_warning(_
-		      ("Y input file <%s> contains %s data points than the X input file"),
+	    G_warning(_("Y input file <%s> contains %s data points than the X input file"),
 		      in[i].name,
 		      ((in[i].num_pnts < in[0].num_pnts) ? "fewer" : "more"));
 

display/d.nviz/main.c

@@ -139,8 +139,7 @@ int main(int argc, char *argv[])
 
     /* check arguments */
     if (!parm.route->answer)
-	G_fatal_error(_
-		      ("Either -i flag and/or route parameter must be used"));
+	G_fatal_error(_("Either -i flag and/or route parameter must be used"));
 
     /* get GRASS parameters */
     G_get_window(&window);
@@ -436,8 +435,7 @@ int read_rast
     if (row < 0 || row > nrows || col < 0 || col > ncols) {
 	G_debug(3, "Fail: row=%d  nrows=%d   col=%d  ncols=%d", row, nrows,
 		col, ncols);
-	G_warning(_
-		  ("Skipping this point, selected point is outside region. "
+	G_warning(_("Skipping this point, selected point is outside region. "
 		   "Perhaps the camera setback distance puts it beyond the edge?"));
 	frame++;
 	return 1;

display/d.path/main.c

@@ -176,8 +176,7 @@ int main(int argc, char **argv)
     if (geo_f->answer) {
 	geo = 1;
 	if (G_projection() != PROJECTION_LL)
-	    G_fatal_error(_
-			  ("The current projection is not longitude-latitude"));
+	    G_fatal_error(_("The current projection is not longitude-latitude"));
     }
     else
 	geo = 0;

display/d.profile/main.c

@@ -103,8 +103,7 @@ int main(int argc, char **argv)
 	d_mapname = dmap->answer;
 	d_mapset = G_find_cell2(d_mapname, "");
 	if (d_mapset == NULL) {
-	    G_warning(_
-		      ("Display raster [%s] not found. Using profile raster."),
+	    G_warning(_("Display raster [%s] not found. Using profile raster."),
 		      d_mapname);
 	    d_mapname = old_mapname;
 	    d_mapset = old_mapset;
@@ -285,8 +284,7 @@ int main(int argc, char **argv)
 		    else if (err == -3)
 			G_fatal_error(_("Error reading from cell-file"));
 		    else if (err == -4)
-			G_fatal_error(_
-				      ("Mysterious window inconsistancy error"));
+			G_fatal_error(_("Mysterious window inconsistancy error"));
 		    else {
 			/* draw profile line on cell-file */
 			black_and_white_line(screen_x, screen_y, cur_screen_x,

display/d.rast.arrow/arrow.c

@@ -221,8 +221,7 @@ int main(int argc, char **argv)
 
     if (opt7->answer) {
 	if (map_type != 1 && map_type != 4)
-	    G_fatal_error(_
-			  ("Magnitude is only supported for GRASS and compass aspect maps."));
+	    G_fatal_error(_("Magnitude is only supported for GRASS and compass aspect maps."));
 
 	mag_map = opt7->answer;
 	if ((mag_mapset = G_find_cell2(mag_map, "")) == NULL)

display/d.rast/main.c

@@ -110,15 +110,13 @@ int main(int argc, char **argv)
     fp = G_raster_map_is_fp(name, mapset);
     if (catlist->answer) {
 	if (fp)
-	    G_warning(_
-		      ("Ignoring catlist: map is floating point (please use 'val=')"));
+	    G_warning(_("Ignoring catlist: map is floating point (please use 'val=')"));
 	else
 	    parse_catlist(catlist->answers, &mask);
     }
     if (vallist->answer) {
 	if (!fp)
-	    G_warning(_
-		      ("Ignoring vallist: map is integer (please use 'cat=')"));
+	    G_warning(_("Ignoring vallist: map is integer (please use 'cat=')"));
 	else
 	    parse_vallist(vallist->answers, &d_mask);
     }

display/d.thematic.area/main.c

@@ -223,8 +223,7 @@ int main(int argc, char **argv)
     level = Vect_open_old(&Map, map_name, mapset);
 
     if (level < 2)
-	G_fatal_error(_
-		      ("%s: You must build topology on vector map. Run v.build."),
+	G_fatal_error(_("%s: You must build topology on vector map. Run v.build."),
 		      map_name);
 
     /* Check database connection and open it */
@@ -313,8 +312,7 @@ int main(int argc, char **argv)
     if (breaks_opt->answers) {
 
 	if (algo_opt->answer || nbclass_opt->answer)
-	    G_warning(_
-		      ("You gave both manual breaks and a classification algorithm or a number of classes. The manual breaks have precedence and will thus be used."));
+	    G_warning(_("You gave both manual breaks and a classification algorithm or a number of classes. The manual breaks have precedence and will thus be used."));
 
 
 	/*Get class breaks */
@@ -380,8 +378,7 @@ int main(int argc, char **argv)
 	}
 	else {
 
-	    G_fatal_error(_
-			  ("You must either give classbreaks or a classification algorithm"));
+	    G_fatal_error(_("You must either give classbreaks or a classification algorithm"));
 
 	}
     };
@@ -394,8 +391,7 @@ int main(int argc, char **argv)
     if (colors_opt->answers != NULL) {
 	for (i = 0; i < nclass; i++) {
 	    if (colors_opt->answers[i] == NULL)
-		G_fatal_error(_
-			      ("Not enough colors or error in color specifications.\nNeed %i colors."),
+		G_fatal_error(_("Not enough colors or error in color specifications.\nNeed %i colors."),
 			      nclass);
 
 	    ret = G_str_to_color(colors_opt->answers[i], &r, &g, &b);
@@ -428,8 +424,7 @@ int main(int argc, char **argv)
 	if (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;
 	}

display/d.thematic.area/plot1.c

@@ -362,16 +362,14 @@ int plot1(struct Map_info *Map, int type, int area, struct cat_list *Clist,
 			}
 			else {
 			    custom_rgb = FALSE;
-			    G_warning(_
-				      ("Error in color definition column (%s), element %d "
+			    G_warning(_("Error in color definition column (%s), element %d "
 				       "with cat %d: colorstring [%s]"),
 				      rgb_column, line, cat, colorstring);
 			}
 		    }
 		    else {
 			custom_rgb = FALSE;
-			G_warning(_
-				  ("Error in color definition column (%s), element %d with cat %d"),
+			G_warning(_("Error in color definition column (%s), element %d with cat %d"),
 				  rgb_column, line, cat);
 		    }
 		}
@@ -439,8 +437,7 @@ int plot1(struct Map_info *Map, int type, int area, struct cat_list *Clist,
 				       DB_C_TYPE_INT ? cv_width->val.
 				       i : (int)cv_width->val.d);
 		    if (width < 0) {
-			G_warning(_
-				  ("Error in line width column (%s), element %d "
+			G_warning(_("Error in line width column (%s), element %d "
 				   "with cat %d: line width [%d]"),
 				  width_column, line, cat, width);
 			width = default_width;

display/d.vect/area.c

@@ -274,15 +274,13 @@ int darea(struct Map_info *Map, struct cat_list *Clist,
 			}
 			else {
 			    rgb = 0;
-			    G_warning(_
-				      ("Error in color definition column (%s), area %d "
+			    G_warning(_("Error in color definition column (%s), area %d "
 				       "with cat %d: colorstring [%s]"),
 				      rgb_column, area, cat, colorstring);
 			}
 		    }
 		    else {
-			G_warning(_
-				  ("Error in color definition column (%s), area %d with cat %d"),
+			G_warning(_("Error in color definition column (%s), area %d with cat %d"),
 				  rgb_column, area, cat);
 			rgb = 0;
 		    }
@@ -343,8 +341,7 @@ int darea(struct Map_info *Map, struct cat_list *Clist,
 				       DB_C_TYPE_INT ? cv_width->val.
 				       i : (int)cv_width->val.d);
 		    if (width < 0) {
-			G_warning(_
-				  ("Error in line width column (%s), element %d "
+			G_warning(_("Error in line width column (%s), element %d "
 				   "with cat %d: line width [%d]"),
 				  width_column, area, cat, width);
 			width = default_width;

display/d.vect/plot1.c

@@ -381,16 +381,14 @@ int plot1(struct Map_info *Map, int type, int area, struct cat_list *Clist,
 			}
 			else {
 			    custom_rgb = FALSE;
-			    G_warning(_
-				      ("Error in color definition column (%s), element %d "
+			    G_warning(_("Error in color definition column (%s), element %d "
 				       "with cat %d: colorstring [%s]"),
 				      rgb_column, line, cat, colorstring);
 			}
 		    }
 		    else {
 			custom_rgb = FALSE;
-			G_warning(_
-				  ("Error in color definition column (%s), element %d with cat %d"),
+			G_warning(_("Error in color definition column (%s), element %d with cat %d"),
 				  rgb_column, line, cat);
 		    }
 		}
@@ -458,8 +456,7 @@ int plot1(struct Map_info *Map, int type, int area, struct cat_list *Clist,
 				       DB_C_TYPE_INT ? cv_width->val.
 				       i : (int)cv_width->val.d);
 		    if (width < 0) {
-			G_warning(_
-				  ("Error in line width column (%s), element %d "
+			G_warning(_("Error in line width column (%s), element %d "
 				   "with cat %d: line width [%d]"),
 				  width_column, line, cat, width);
 			width = default_width;

display/d.where/main.c

@@ -93,20 +93,17 @@ int main(int argc, char **argv)
 	    G_fatal_error(_("Can't get projection info of current location"));
 
 	if ((in_unit_info = G_get_projunits()) == NULL)
-	    G_fatal_error(_
-			  ("Can't get projection units of current location"));
+	    G_fatal_error(_("Can't get projection units of current location"));
 
 	if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0)
-	    G_fatal_error(_
-			  ("Can't get projection key values of current location"));
+	    G_fatal_error(_("Can't get projection key values of current location"));
 
 
 	if (!wgs84->answer) {
 	    /* Set output to same ellipsoid as input if we're not looking
 	     * for the WGS84 values */
 	    if (GPJ_get_equivalent_latlong(&oproj, &iproj) < 0)
-		G_fatal_error(_
-			      ("Unable to set up lat/long projection parameters"));
+		G_fatal_error(_("Unable to set up lat/long projection parameters"));
 
 	}
 	else {
@@ -122,8 +119,7 @@ int main(int argc, char **argv)
 	     * the WGS84 values would be meaningless), and if they are set the 
 	     * output datum to WGS84 */
 	    if (G_get_datumparams_from_projinfo(in_proj_info, buff, dum) < 0)
-		G_fatal_error(_
-			      ("WGS84 output not possible as this location does not contain\n"
+		G_fatal_error(_("WGS84 output not possible as this location does not contain\n"
 			       "datum transformation parameters. Try running g.setproj."));
 	    else
 		G_set_key_value("datum", "wgs84", out_proj_info);
@@ -133,8 +129,7 @@ int main(int argc, char **argv)
 	    G_set_key_value("meters", "1.0", out_unit_info);
 
 	    if (pj_get_kv(&oproj, out_proj_info, out_unit_info) < 0)
-		G_fatal_error(_
-			      ("Unable to set up lat/long projection parameters"));
+		G_fatal_error(_("Unable to set up lat/long projection parameters"));
 
 	    G_free_key_value(out_proj_info);
 	    G_free_key_value(out_unit_info);