fixed unlucky formatted messages (thanks to Glynn)

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

doc/vector/v.example/main.c

@@ -173,8 +173,7 @@ int main(int argc, char *argv[])
 		/* Let's output every columns name and value */
 		while (1) {
 		    if (db_fetch(&cursor, DB_NEXT, &more) != DB_OK) {
-			G_warning(_
-				  ("Error while retreiving database record for cat %d"),
+			G_warning(_("Error while retreiving database record for cat %d"),
 				  cat);
 			break;
 		    }

general/g.access/main.c

@@ -61,8 +61,7 @@ int main(int argc, char *argv[])
 
     /* this part is until PERMANENT no longer holds DEFAULT_WIND and MYNAME */
     if (strcmp(G_mapset(), "PERMANENT") == 0)
-	G_fatal_error(_
-		      ("Access to the PERMANENT mapset must be open, nothing changed"));
+	G_fatal_error(_("Access to the PERMANENT mapset must be open, nothing changed"));
 
     /* get the current permissions */
     if (get_perms(path, &perms, &group, &other) < 0)

general/g.findfile/main.c

@@ -71,8 +71,7 @@ int main(int argc, char *argv[])
 
 	if (G_number_of_tokens(map_mapset) > 1) {
 	    if (strcmp(map_mapset[1], opt2->answer))
-		G_fatal_error(_
-			      ("Parameter 'file' contains reference to <%s> mapset, but mapset parameter <%s> does not correspond"),
+		G_fatal_error(_("Parameter 'file' contains reference to <%s> mapset, but mapset parameter <%s> does not correspond"),
 			      map_mapset[1], opt2->answer);
 	    else
 		strcpy(name, opt3->answer);

general/g.mapset/main.c

@@ -143,8 +143,7 @@ int main(int argc, char *argv[])
 	    G_make_mapset(gisdbase_new, location_new, mapset_new);
 	}
 	else
-	    G_fatal_error(_
-			  ("The mapset does not exist. Use -c flag to create it."));
+	    G_fatal_error(_("The mapset does not exist. Use -c flag to create it."));
 	break;
     default:
 	break;
@@ -167,8 +166,7 @@ int main(int argc, char *argv[])
     /* Warning: the value returned by system() is not that returned by exit() in executed program
      *          e.g. exit(1) -> 256 (multiplied by 256) */
     if (ret != 0)
-	G_fatal_error(_
-		      ("%s is currently running GRASS in selected mapset or lock file cannot be checked"),
+	G_fatal_error(_("%s is currently running GRASS in selected mapset or lock file cannot be checked"),
 		      G_whoami());
 
     /* Clean temporary directory */
@@ -187,8 +185,7 @@ int main(int argc, char *argv[])
 
     G_free(mapset_old_path);
 
-    G_warning(_
-	      ("Your shell continues to use the history for the old mapset"));
+    G_warning(_("Your shell continues to use the history for the old mapset"));
 
     if ((shell = getenv("SHELL"))) {
 	if (strstr(shell, "bash")) {

general/g.proj/main.c

@@ -174,8 +174,7 @@ int main(int argc, char *argv[])
     importformats = ((ingeo->answer ? 1 : 0) + (inwkt->answer ? 1 : 0) +
 		     (inproj4->answer ? 1 : 0) + (inepsg->answer ? 1 : 0));
     if (importformats > 1)
-	G_fatal_error(_
-		      ("Only one of '%s', '%s', '%s' or '%s' options may be specified"),
+	G_fatal_error(_("Only one of '%s', '%s', '%s' or '%s' options may be specified"),
 		      ingeo->key, inwkt->key, inproj4->key, inepsg->key);
 
     /* Input */

general/g.proj/output.c

@@ -170,8 +170,7 @@ void create_location(char *location)
 	struct Cell_head old_cellhd;
 
 	if (strcmp(mapset, "PERMANENT") != 0)
-	    G_fatal_error(_
-			  ("You must select the PERMANENT mapset before updating the "
+	    G_fatal_error(_("You must select the PERMANENT mapset before updating the "
 			   "current location's projection. (Current mapset is %s)"),
 			  mapset);
 
@@ -208,8 +207,7 @@ void create_location(char *location)
 		 * number or zone have changed */
 		G__put_window(&cellhd, "", "DEFAULT_WIND");
 		G__put_window(&cellhd, "", "WIND");
-		G_message(_
-			  ("N.B. The default region was updated to the new projection, but if you have "
+		G_message(_("N.B. The default region was updated to the new projection, but if you have "
 			   "multiple mapsets g.region -d should be run in each to update the region from "
 			   "the default."));
 	    }

general/g.region/main.c

@@ -450,8 +450,7 @@ int main(int argc, char *argv[])
 	    if (!mapset)
 		G_fatal_error(_("Raster map <%s> not found"), rast_name);
 	    if (G_get_cellhd(rast_name, mapset, &temp_window) < 0)
-		G_fatal_error(_
-			      ("Unable to read header of raster map <%s@%s>"),
+		G_fatal_error(_("Unable to read header of raster map <%s@%s>"),
 			      rast_name, mapset);
 	    if (!first) {
 		G_copy(&window, &temp_window, sizeof(window));

general/g.region/printwindow.c

@@ -240,16 +240,13 @@ int print_window(struct Cell_head *window, int print_flag)
 
 	    /* read current projection info */
 	    if ((in_proj_info = G_get_projinfo()) == NULL)
-		G_fatal_error(_
-			      ("Can't get projection info of current location"));
+		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"));
 
 	    G_free_key_value(in_proj_info);
 	    G_free_key_value(in_unit_info);
@@ -259,8 +256,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    oproj.meters = 1.;
 	    sprintf(oproj.proj, "ll");
 	    if ((oproj.pj = pj_latlong_from_proj(iproj.pj)) == NULL)
-		G_fatal_error(_
-			      ("Unable to update lat/long projection parameters"));
+		G_fatal_error(_("Unable to update lat/long projection parameters"));
 
 	    /* for DEBUG
 	       pj_print_proj_params(&iproj,&oproj);
@@ -278,8 +274,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    latitude = window->north;
 	    longitude = window->west;
 	    if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0)
-		G_fatal_error(_
-			      ("Error in pj_do_proj (projection of input coordinate pair)"));
+		G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 
 	    lo1 = longitude;
 	    la1 = latitude;
@@ -287,8 +282,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    latitude = window->north;
 	    longitude = window->east;
 	    if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0)
-		G_fatal_error(_
-			      ("Error in pj_do_proj (projection of input coordinate pair)"));
+		G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 
 	    lo2 = longitude;
 	    la2 = latitude;
@@ -296,8 +290,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    latitude = window->south;
 	    longitude = window->east;
 	    if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0)
-		G_fatal_error(_
-			      ("Error in pj_do_proj (projection of input coordinate pair)"));
+		G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 
 	    lo3 = longitude;
 	    la3 = latitude;
@@ -305,8 +298,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    latitude = window->south;
 	    longitude = window->west;
 	    if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0)
-		G_fatal_error(_
-			      ("Error in pj_do_proj (projection of input coordinate pair)"));
+		G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 
 	    lo4 = longitude;
 	    la4 = latitude;
@@ -411,11 +403,9 @@ int print_window(struct Cell_head *window, int print_flag)
 	else {			/* in lat/long already */
 
 	    if (window->proj != 0)
-		G_message(_
-			  ("You are already in Lat/Long. Use the -p flag instead."));
+		G_message(_("You are already in Lat/Long. Use the -p flag instead."));
 	    else
-		G_message(_
-			  ("You are in a simple XY location, projection to Lat/Lon "
+		G_message(_("You are in a simple XY location, projection to Lat/Lon "
 			   "is not possible. Use the -p flag instead."));
 	}
     }
@@ -494,16 +484,13 @@ int print_window(struct Cell_head *window, int print_flag)
 
 	    /* read current projection info */
 	    if ((in_proj_info = G_get_projinfo()) == NULL)
-		G_fatal_error(_
-			      ("Can't get projection info of current location"));
+		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"));
 
 	    /*  output projection to lat/long  and wgs84 ellipsoid */
 	    out_proj_info = G_create_key_value();
@@ -512,8 +499,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    G_set_key_value("proj", "ll", out_proj_info);
 
 	    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 "
+		G_fatal_error(_("WGS84 output not possible as this location does not contain "
 			       "datum transformation parameters. Try running g.setproj."));
 	    else
 		G_set_key_value("datum", "wgs84", out_proj_info);
@@ -523,8 +509,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    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 update lat/long projection parameters"));
+		G_fatal_error(_("Unable to update lat/long projection parameters"));
 
 	    G_free_key_value(in_proj_info);
 	    G_free_key_value(in_unit_info);
@@ -553,8 +538,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    latitude = window->north;
 	    longitude = window->west;
 	    if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0)
-		G_fatal_error(_
-			      ("Error in pj_do_proj (projection of input coordinate pair)"));
+		G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 
 	    lo1 = longitude;
 	    la1 = latitude;
@@ -562,8 +546,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    latitude = window->north;
 	    longitude = window->east;
 	    if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0)
-		G_fatal_error(_
-			      ("Error in pj_do_proj (projection of input coordinate pair)"));
+		G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 
 	    lo2 = longitude;
 	    la2 = latitude;
@@ -571,8 +554,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    latitude = window->south;
 	    longitude = window->east;
 	    if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0)
-		G_fatal_error(_
-			      ("Error in pj_do_proj (projection of input coordinate pair)"));
+		G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 
 	    lo3 = longitude;
 	    la3 = latitude;
@@ -580,8 +562,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	    latitude = window->south;
 	    longitude = window->west;
 	    if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0)
-		G_fatal_error(_
-			      ("Error in pj_do_proj (projection of input coordinate pair)"));
+		G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 
 	    lo4 = longitude;
 	    la4 = latitude;
@@ -664,8 +645,7 @@ int print_window(struct Cell_head *window, int print_flag)
 	     */
 	}
 	else {
-	    G_warning(_
-		      ("Lat/Long calculations are not possible from a simple XY system"));
+	    G_warning(_("Lat/Long calculations are not possible from a simple XY system"));
 	}
     }
 

general/g.setproj/main.c

@@ -84,8 +84,7 @@ int main(int argc, char *argv[])
 
 
     if (strcmp(G_mapset(), "PERMANENT") != 0)
-	G_fatal_error(_
-		      ("You must be in the PERMANENT mapset to run g.setproj"));
+	G_fatal_error(_("You must be in the PERMANENT mapset to run g.setproj"));
 
 	/***
          * no longer necessary, table is a static struct 
@@ -195,8 +194,7 @@ int main(int argc, char *argv[])
 
     proj_parms = get_proj_parms(proj_out);
     if (!proj_parms)
-	G_fatal_error(_
-		      ("Projection %s is not specified in the file 'proj-parms.table'"),
+	G_fatal_error(_("Projection %s is not specified in the file 'proj-parms.table'"),
 		      proj_out);
 
     G_set_key_value("name", proj_name, out_proj_keys);
@@ -215,8 +213,7 @@ int main(int argc, char *argv[])
 		G_message(_("The current datum is %s (%s)"),
 			  G_datum_name(i), G_datum_description(i));
 		if (G_yes
-		    (_
-		     ("Do you wish to change the datum (or datum transformation parameters)?"),
+		    (_("Do you wish to change the datum (or datum transformation parameters)?"),
 		     0))
 		    sph_check = ask_datum(datum, dat_ellps, dat_params);
 		else {
@@ -224,8 +221,7 @@ int main(int argc, char *argv[])
 		    sprintf(dat_params, lbufa);
 		    sprintf(dat_ellps, G_datum_ellipsoid(i));
 		    sph_check = 1;
-		    G_message(_
-			      ("The datum information has not been changed"));
+		    G_message(_("The datum information has not been changed"));
 		}
 	    }
 	    else
@@ -294,8 +290,7 @@ int main(int argc, char *argv[])
 			     0))
 			    sph_check = G_ask_ellipse_name(spheroid);
 			else {
-			    G_message(_
-				      ("The ellipse information has not been changed"));
+			    G_message(_("The ellipse information has not been changed"));
 			    sph_check = 1;
 			}
 		    }		/* the val is legal */
@@ -315,15 +310,13 @@ int main(int argc, char *argv[])
 			G_message(_("The radius is currently %f"), radius);
 			if (G_yes(_("Do you want to change the radius?"), 0))
 			    radius =
-				prompt_num_double(_
-						  ("Enter radius for the sphere in meters"),
+				prompt_num_double(_("Enter radius for the sphere in meters"),
 						  RADIUS_DEF, 1);
 		    }
 		}
 		else
 		    radius =
-			prompt_num_double(_
-					  ("Enter radius for the sphere in meters"),
+			prompt_num_double(_("Enter radius for the sphere in meters"),
 					  RADIUS_DEF, 1);
 	    }			/* end ask radius */
 	}
@@ -454,20 +447,17 @@ int main(int argc, char *argv[])
 				  old_zone);
 			if (!G_yes
 			    (_("Do you want to change the UTM zone?"), 0)) {
-			    G_message(_
-				      ("UTM zone information has not been updated"));
+			    G_message(_("UTM zone information has not been updated"));
 			    zone = old_zone;
 			    break;
 			}
 			else {
-			    G_message(_
-				      ("But if you change zone, all the existing "
+			    G_message(_("But if you change zone, all the existing "
 				       "data will be interpreted by projection software. "
 				       "GRASS will not automatically re-project or even "
 				       "change the headers for existing maps."));
 			    if (!G_yes
-				(_
-				 ("Would you still like to change the UTM zone?"),
+				(_("Would you still like to change the UTM zone?"),
 				 0)) {
 				zone = old_zone;
 				break;
@@ -655,8 +645,7 @@ int main(int argc, char *argv[])
 	    _
 	    ("\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(_("The geographic region information in WIND is now obsolete"));
 	G_message(_("Run g.region -d to update it"));
     }
     leave(0);

general/manage/cmd/remove.c

@@ -38,8 +38,7 @@ static int check_reclass(const char *name, const char *mapset, int force)
 		G_warning(_("[%s@%s] is a base map for [%s]. Remove forced."),
 			  name, mapset, *rmaps);
 	    else
-		G_warning(_
-			  ("[%s@%s] is a base map. Remove reclassed map first: %s"),
+		G_warning(_("[%s@%s] is a base map. Remove reclassed map first: %s"),
 			  name, mapset, *rmaps);
 	}
 
@@ -61,8 +60,7 @@ static int check_reclass(const char *name, const char *mapset, int force)
 	if (nrmaps == 1 && !G_strcasecmp(rmaps[0], qname)) {
 
 	    if (remove(path) < 0)
-		G_warning(_
-			  ("Removing information about reclassed map from [%s@%s] failed"),
+		G_warning(_("Removing information about reclassed map from [%s@%s] failed"),
 			  rname, rmapset);
 	}
 	else {
@@ -75,8 +73,7 @@ static int check_reclass(const char *name, const char *mapset, int force)
 		fclose(fp);
 	    }
 	    else
-		G_warning(_
-			  ("Removing information about reclassed map from [%s@%s] failed"),
+		G_warning(_("Removing information about reclassed map from [%s@%s] failed"),
 			  rname, rmapset);
 
 	}

general/manage/cmd/rename.c

@@ -85,8 +85,7 @@ int main(int argc, char *argv[])
 		continue;
 	    }
 	    if (strcmp(old, new) == 0) {
-		G_warning(_
-			  ("%s=%s,%s: files are the same, no rename required"),
+		G_warning(_("%s=%s,%s: files are the same, no rename required"),
 			  parm[n]->key, old, new);
 		continue;
 	    }

ps/ps.map/do_geogrid.c

@@ -269,8 +269,7 @@ void init_proj(struct pj_info *info_in, struct pj_info *info_out)
     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"));
     G_free_key_value(out_proj_keys);
     G_free_key_value(out_unit_keys);
 

ps/ps.map/do_labels.c

@@ -158,8 +158,7 @@ int do_label(FILE * fd, int font_override)
 
 	    /* set font size if given in map units and not given by fontsize */
 	    if (fontsize && size > 0)
-		G_warning(_
-			  ("Text labels: 'fontsize' given so ignoring 'size'"));
+		G_warning(_("Text labels: 'fontsize' given so ignoring 'size'"));
 
 	    if (!fontsize)
 		fontsize = size * PS.ns_to_y;

ps/ps.map/main.c

@@ -283,8 +283,7 @@ int main(int argc, char *argv[])
 	if (!input(1, buf, help)) {
 	    if (!iflag) {
 		if (G_getl2(buf, 12, inputfd))
-		    G_warning(_
-			      ("Data exists after final 'end' instruction!"));
+		    G_warning(_("Data exists after final 'end' instruction!"));
 		break;
 	    }
 	    iflag = 0;

ps/ps.map/ps_fclrtbl.c

@@ -55,8 +55,7 @@ int PS_fcolortable(void)
     }
 
     if (dmin == dmax) {		/* if step==0 all sorts of infinite loops and DIV by 0 errors follow */
-	G_warning(_
-		  ("A floating point colortable must contain a range of values"));
+	G_warning(_("A floating point colortable must contain a range of values"));
 	return 1;
     }
 

ps/ps.map/ps_vareas.c

@@ -103,8 +103,7 @@ void set_ps_color_rgbcol_varea(struct Map_info *map, int vec, int area,
 	rgbstring = db_get_string(cv_rgb->val.s);
 	if (rgbstring == NULL ||
 	    G_str_to_color(rgbstring, &red, &grn, &blu) != 1) {
-	    G_warning(_
-		      ("Invalid RGB color definition in column <%s> for category [%d]"),
+	    G_warning(_("Invalid RGB color definition in column <%s> for category [%d]"),
 		      vector.layer[vec].rgbcol, cat);
 	    rgbstring = NULL;
 	}

ps/ps.map/ps_vlines.c

@@ -121,8 +121,7 @@ int PS_vlines_plot(struct Map_info *P_map, int vec, int type)
 		rgbstring = db_get_string(cv_rgb->val.s);
 		if (rgbstring == NULL ||
 		    G_str_to_color(rgbstring, &red, &grn, &blu) != 1) {
-		    G_warning(_
-			      ("Invalid RGB color definition in column <%s> for category [%d]"),
+		    G_warning(_("Invalid RGB color definition in column <%s> for category [%d]"),
 			      vector.layer[vec].rgbcol, cat);
 		    rgbstring = NULL;
 		}

ps/ps.map/ps_vpoints.c

@@ -178,8 +178,7 @@ int PS_vpoints_plot(struct Map_info *P_map, int vec, int type)
 	    }
 
 	    if (size_val < 0.0) {
-		G_warning(_
-			  ("Attribute is of invalid size [%.3f] for category [%d]"),
+		G_warning(_("Attribute is of invalid size [%.3f] for category [%d]"),
 			  size_val, cat);
 		continue;
 	    }
@@ -203,8 +202,7 @@ int PS_vpoints_plot(struct Map_info *P_map, int vec, int type)
 		rgbstring = db_get_string(cv_rgb->val.s);
 		if (rgbstring == NULL ||
 		    G_str_to_color(rgbstring, &red, &grn, &blu) != 1) {
-		    G_warning(_
-			      ("Invalid RGB color definition in column <%s> for category [%d]"),
+		    G_warning(_("Invalid RGB color definition in column <%s> for category [%d]"),
 			      vector.layer[vec].rgbcol, cat);
 		    rgbstring = NULL;
 		}

ps/ps.map/r_vpoints.c

@@ -241,8 +241,7 @@ int read_vpoints(char *name, char *mapset)
 	   remove sizecol test and the warning in GRASS7
 	 */
 	if (KEY("sizecol")) {
-	    G_warning(_
-		      ("The mapping instruction <%s> will be renamed to <%s> "
+	    G_warning(_("The mapping instruction <%s> will be renamed to <%s> "
 		       "in future versions of GRASS. Please use <%s> instead."),
 		      "sizecol", "sizecolumn", "sizecolumn");
 	}

visualization/nviz/src/nviz_init.c

@@ -276,8 +276,7 @@ static int parse_command(Nv_data * data, Tcl_Interp * interp,	/* Current interpr
 	}
 	if (ee != cc)
 	    G_fatal_error
-		(_
-		 ("Number of elevation files does not match number of colors files"));
+		(_("Number of elevation files does not match number of colors files"));
     }
 
     if (elev->answers) {

visualization/nviz2/cmd/args.c

@@ -519,8 +519,7 @@ void check_parameters(const struct GParams *params)
     /* mask */
     nmaps = opt_get_num_answers(params->mask_map);
     if (nmaps > 0 && nelevs != nmaps)
-	G_fatal_error(_
-		      ("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
+	G_fatal_error(_("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
 		      params->elev_map->key, params->elev_const->key, nelevs,
 		      params->mask_map->key, nmaps);
 
@@ -550,43 +549,37 @@ void check_parameters(const struct GParams *params)
     if (!params->mode_all->answer) {	/* use one mode for all surfaces */
 	nconsts = opt_get_num_answers(params->mode);
 	if (nconsts > 0 && nconsts != nelevs)
-	    G_fatal_error(_
-			  ("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
+	    G_fatal_error(_("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
 			  params->elev_map->key, params->elev_const->key,
 			  nelevs, params->mode->key, nconsts);
 
 	nconsts = opt_get_num_answers(params->res_fine);
 	if (nconsts > 0 && nconsts != nelevs)
-	    G_fatal_error(_
-			  ("Inconsistent number of attributes (<%s/%s> %d: <%s> %d"),
+	    G_fatal_error(_("Inconsistent number of attributes (<%s/%s> %d: <%s> %d"),
 			  params->elev_map->key, params->elev_const->key,
 			  nelevs, params->res_fine->key, nconsts);
 
 	nconsts = opt_get_num_answers(params->res_coarse);
 	if (nconsts > 0 && nconsts != nelevs)
-	    G_fatal_error(_
-			  ("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
+	    G_fatal_error(_("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
 			  params->elev_map->key, params->elev_const->key,
 			  nelevs, params->res_coarse->key, nconsts);
 
 	nconsts = opt_get_num_answers(params->style);
 	if (nconsts > 0 && nconsts != nelevs)
-	    G_fatal_error(_
-			  ("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
+	    G_fatal_error(_("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
 			  params->elev_map->key, params->elev_const->key,
 			  nelevs, params->style->key, nconsts);
 
 	nconsts = opt_get_num_answers(params->shade);
 	if (nconsts > 0 && nconsts != nelevs)
-	    G_fatal_error(_
-			  ("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
+	    G_fatal_error(_("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
 			  params->elev_map->key, params->elev_const->key,
 			  nelevs, params->shade->key, nconsts);
 
 	nconsts = opt_get_num_answers(params->wire_color);
 	if (nconsts > 0 && nconsts != nelevs)
-	    G_fatal_error(_
-			  ("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
+	    G_fatal_error(_("Inconsistent number of attributes (<%s/%s> %d: <%s> %d)"),
 			  params->elev_map->key, params->elev_const->key,
 			  nelevs, params->wire_color->key, nconsts);
     }
@@ -599,32 +592,28 @@ void check_parameters(const struct GParams *params)
     /* width */
     nconsts = opt_get_num_answers(params->vline_width);
     if (nvects > 0 && nconsts != nvects)
-	G_fatal_error(_
-		      ("Inconsistent number of attributes (<%s> %d: <%s> %d)"),
+	G_fatal_error(_("Inconsistent number of attributes (<%s> %d: <%s> %d)"),
 		      params->vlines->key, nvects, params->vline_width->key,
 		      nconsts);
 
     /* color */
     nconsts = opt_get_num_answers(params->vline_color);
     if (nvects > 0 && nconsts != nvects)
-	G_fatal_error(_
-		      ("Inconsistent number of attributes (<%s> %d: <%s> %d"),
+	G_fatal_error(_("Inconsistent number of attributes (<%s> %d: <%s> %d"),
 		      params->vlines->key, nvects, params->vline_color->key,
 		      nconsts);
 
     /* mode */
     nconsts = opt_get_num_answers(params->vline_mode);
     if (nvects > 0 && nconsts != nvects)
-	G_fatal_error(_
-		      ("Inconsistent number of attributes (<%s> %d: <%s> %d)"),
+	G_fatal_error(_("Inconsistent number of attributes (<%s> %d: <%s> %d)"),
 		      params->vlines->key, nvects, params->vline_mode->key,
 		      nconsts);
 
     /* height */
     nconsts = opt_get_num_answers(params->vline_height);
     if (nvects > 0 && nconsts != nvects)
-	G_fatal_error(_
-		      ("Inconsistent number of attributes (<%s> %d: <%s> %d)"),
+	G_fatal_error(_("Inconsistent number of attributes (<%s> %d: <%s> %d)"),
 		      params->vlines->key, nvects, params->vline_height->key,
 		      nconsts);
 
@@ -636,8 +625,7 @@ void print_error(int nmaps, int nconsts, int nelevs,
 		 const char *map_name, const char *const_name)
 {
     if ((nmaps > 0 && nelevs != nmaps) || (nconsts > 0 && nelevs != nconsts))
-	G_fatal_error(_
-		      ("Inconsistent number of attributes (<%s/%s> %d: <%s> %d, <%s> %d"),
+	G_fatal_error(_("Inconsistent number of attributes (<%s/%s> %d: <%s> %d, <%s> %d"),
 		      elev_map, elev_const, nelevs, map_name, nmaps,
 		      const_name, nconsts);
 

visualization/nviz2/cmd/main.c

@@ -120,8 +120,7 @@ int main(int argc, char *argv[])
     }
     else {
 	z_exag = Nviz_get_exag();
-	G_message(_
-		  ("Vertical exaggeration not given, using calculated value %f"),
+	G_message(_("Vertical exaggeration not given, using calculated value %f"),
 		  z_exag);
     }
     Nviz_change_exag(&data, z_exag);

visualization/nviz2/cmd/surface.c

@@ -68,8 +68,7 @@ int load_rasters(const struct GParams *params, nv_data * data)
 				      data);
 	    }
 	    else {
-		G_fatal_error(_
-			      ("Missing topography attribute for surface %d"),
+		G_fatal_error(_("Missing topography attribute for surface %d"),
 			      i + 1);
 	    }
 	}
@@ -115,8 +114,7 @@ int load_rasters(const struct GParams *params, nv_data * data)
 	    Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT,
 			  G_fully_qualified_name(params->elev_map->answers[i],
 						 mapset), -1.0, data);
-	    G_verbose_message(_
-			      ("Color attribute not defined, using default <%s>"),
+	    G_verbose_message(_("Color attribute not defined, using default <%s>"),
 			      G_fully_qualified_name(params->elev_map->
 						     answers[i], mapset));
 	}