[GRASS-SVN] r32583 - in grass/branches/develbranch_6: db/base
db/drivers/ogr db/drivers/postgres db/drivers/sqlite
display/d.barscale display/d.extract display/d.font
display/d.grid display/d.legend display/d.linegraph
display/d.nviz display/d.paint.labels display/d.path
display/d.profile display/d.rast display/d.rast.arrow
display/d.text.freetype display/d.thematic.area
display/d.vect display/d.where doc/vector/v.example
general/g.access general/g.findfile general/g.mapset
general/g.proj general/g.region general/g.setproj
general/manage/cmd imagery/i.cca imagery/i.class
imagery/i.cluster imagery/i.fft imagery/i.gensig
imagery/i.group imagery/i.ifft imagery/i.maxlik
imagery/i.ortho.photo/photo.rectify imagery/i.pca
imagery/i.rectify imagery/i.smap/bouman
imagery/i.smap/shapiro imagery/i.zc lib/arraystats lib/driver
lib/g3d lib/gis lib/gmath lib/gpde lib/gpde/test lib/imagery
lib/ogsf lib/proj lib/raster lib/rst/interp_float lib/symbol
lib/vector/Vlib lib/vector/diglib lib/vector/vedit ps/ps.map
raster/r.bilinear raster/r.carve raster/r.cats raster/r.clump
raster/r.colors raster/r.contour raster/r.cost raster/r.drain
raster/r.flow raster/r.gwflow raster/r.in.ascii
raster/r.in.bin raster/r.in.gdal raster/r.in.mat
raster/r.in.xyz raster/r.kappa raster/r.lake
raster/r.li/r.li.daemon raster/r.los raster/r.mfilter
raster/r.mfilter.fp raster/r.out.gdal raster/r.out.pov
raster/r.out.vtk raster/r.param.scale raster/r.profile
raster/r.proj raster/r.proj.seg raster/r.quant
raster/r.random raster/r.random.surface raster/r.reclass
raster/r.recode raster/r.resamp.rst raster/r.slope.aspect
raster/r.statistics raster/r.stats raster/r.sun
raster/r.sunmask raster/r.support/front
raster/r.support/modhead raster/r.support/modhist
raster/r.surf.fractal raster/r.surf.idw2 raster/r.texture
raster/r.thin raster/r.to.rast3 raster/r.to.rast3elev
raster/r.to.vect raster/r.topidx raster/r.walk
raster/r.water.outlet raster/r.watershed/seg
raster/r.watershed/shed raster/simwe/r.sim.water
raster/simwe/simlib raster/wildfire/r.ros raster3d/base
raster3d/r3.cross.rast raster3d/r3.gwflow
raster3d/r3.in.ascii raster3d/r3.out.vtk raster3d/r3.stats
raster3d/r3.to.rast vector/lidar/v.lidar.correction
vector/lidar/v.lidar.edgedetection
vector/lidar/v.lidar.growing vector/lidar/v.outlier
vector/lidar/v.surf.bspline vector/v.buffer vector/v.build
vector/v.category vector/v.clean vector/v.convert
vector/v.db.connect vector/v.digit vector/v.distance
vector/v.drape vector/v.edit vector/v.generalize
vector/v.hull vector/v.in.ascii vector/v.in.db
vector/v.in.ogr vector/v.in.sites vector/v.info vector/v.kcv
vector/v.kernel vector/v.label vector/v.label.sa
vector/v.lrs/v.lrs.create vector/v.lrs/v.lrs.segment
vector/v.mapcalc vector/v.net vector/v.net.alloc
vector/v.net.iso vector/v.out.ascii vector/v.out.ogr
vector/v.out.vtk vector/v.overlay vector/v.patch
vector/v.perturb vector/v.proj vector/v.random
vector/v.reclass vector/v.sample vector/v.segment
vector/v.surf.idw vector/v.surf.rst vector/v.to.db
vector/v.to.rast vector/v.transform vector/v.univar
vector/v.vol.rst vector/v.what.rast visualization/nviz/src
visualization/nviz2/cmd
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 6 17:37:43 EDT 2008
Author: neteler
Date: 2008-08-06 17:37:41 -0400 (Wed, 06 Aug 2008)
New Revision: 32583
Modified:
grass/branches/develbranch_6/db/base/copy.c
grass/branches/develbranch_6/db/drivers/ogr/describe.c
grass/branches/develbranch_6/db/drivers/postgres/describe.c
grass/branches/develbranch_6/db/drivers/postgres/parse.c
grass/branches/develbranch_6/db/drivers/sqlite/describe.c
grass/branches/develbranch_6/display/d.barscale/main.c
grass/branches/develbranch_6/display/d.extract/extract.c
grass/branches/develbranch_6/display/d.font/main.c
grass/branches/develbranch_6/display/d.grid/main.c
grass/branches/develbranch_6/display/d.grid/plot.c
grass/branches/develbranch_6/display/d.legend/main.c
grass/branches/develbranch_6/display/d.linegraph/linegraph.c
grass/branches/develbranch_6/display/d.nviz/main.c
grass/branches/develbranch_6/display/d.paint.labels/main.c
grass/branches/develbranch_6/display/d.path/main.c
grass/branches/develbranch_6/display/d.profile/main.c
grass/branches/develbranch_6/display/d.rast.arrow/arrow.c
grass/branches/develbranch_6/display/d.rast/main.c
grass/branches/develbranch_6/display/d.text.freetype/main.c
grass/branches/develbranch_6/display/d.thematic.area/main.c
grass/branches/develbranch_6/display/d.thematic.area/plot1.c
grass/branches/develbranch_6/display/d.vect/area.c
grass/branches/develbranch_6/display/d.vect/main.c
grass/branches/develbranch_6/display/d.vect/plot1.c
grass/branches/develbranch_6/display/d.where/main.c
grass/branches/develbranch_6/doc/vector/v.example/main.c
grass/branches/develbranch_6/general/g.access/main.c
grass/branches/develbranch_6/general/g.findfile/main.c
grass/branches/develbranch_6/general/g.mapset/main.c
grass/branches/develbranch_6/general/g.proj/main.c
grass/branches/develbranch_6/general/g.proj/output.c
grass/branches/develbranch_6/general/g.region/main.c
grass/branches/develbranch_6/general/g.region/printwindow.c
grass/branches/develbranch_6/general/g.setproj/main.c
grass/branches/develbranch_6/general/manage/cmd/remove.c
grass/branches/develbranch_6/general/manage/cmd/rename.c
grass/branches/develbranch_6/imagery/i.cca/main.c
grass/branches/develbranch_6/imagery/i.class/add_point.c
grass/branches/develbranch_6/imagery/i.class/complete_reg.c
grass/branches/develbranch_6/imagery/i.class/readbands.c
grass/branches/develbranch_6/imagery/i.class/signature.c
grass/branches/develbranch_6/imagery/i.cluster/checkpt.c
grass/branches/develbranch_6/imagery/i.cluster/main.c
grass/branches/develbranch_6/imagery/i.fft/fftmain.c
grass/branches/develbranch_6/imagery/i.gensig/get_train.c
grass/branches/develbranch_6/imagery/i.gensig/openfiles.c
grass/branches/develbranch_6/imagery/i.group/main.c
grass/branches/develbranch_6/imagery/i.ifft/ifftmain.c
grass/branches/develbranch_6/imagery/i.ifft/orig_wind.c
grass/branches/develbranch_6/imagery/i.maxlik/invert.c
grass/branches/develbranch_6/imagery/i.maxlik/open.c
grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/write.c
grass/branches/develbranch_6/imagery/i.pca/main.c
grass/branches/develbranch_6/imagery/i.rectify/main.c
grass/branches/develbranch_6/imagery/i.smap/bouman/model.c
grass/branches/develbranch_6/imagery/i.smap/shapiro/openfiles.c
grass/branches/develbranch_6/imagery/i.smap/shapiro/read_sig.c
grass/branches/develbranch_6/imagery/i.zc/main.c
grass/branches/develbranch_6/lib/arraystats/class.c
grass/branches/develbranch_6/lib/driver/parse_ftcap.c
grass/branches/develbranch_6/lib/g3d/g3dopen.c
grass/branches/develbranch_6/lib/g3d/g3dparam.c
grass/branches/develbranch_6/lib/gis/adj_cellhd.c
grass/branches/develbranch_6/lib/gis/closecell.c
grass/branches/develbranch_6/lib/gis/get_ellipse.c
grass/branches/develbranch_6/lib/gis/get_row.c
grass/branches/develbranch_6/lib/gis/gisinit.c
grass/branches/develbranch_6/lib/gis/history.c
grass/branches/develbranch_6/lib/gis/legal_name.c
grass/branches/develbranch_6/lib/gis/opencell.c
grass/branches/develbranch_6/lib/gis/parser.c
grass/branches/develbranch_6/lib/gis/put_row.c
grass/branches/develbranch_6/lib/gis/reclass.c
grass/branches/develbranch_6/lib/gis/set_window.c
grass/branches/develbranch_6/lib/gis/spawn.c
grass/branches/develbranch_6/lib/gis/view.c
grass/branches/develbranch_6/lib/gmath/la.c
grass/branches/develbranch_6/lib/gpde/N_solvers.c
grass/branches/develbranch_6/lib/gpde/N_solvers_krylov.c
grass/branches/develbranch_6/lib/gpde/test/test_gwflow.c
grass/branches/develbranch_6/lib/gpde/test/test_heat.c
grass/branches/develbranch_6/lib/gpde/test/test_solute_transport.c
grass/branches/develbranch_6/lib/imagery/fopen.c
grass/branches/develbranch_6/lib/ogsf/GK2.c
grass/branches/develbranch_6/lib/ogsf/GS2.c
grass/branches/develbranch_6/lib/ogsf/Gp3.c
grass/branches/develbranch_6/lib/ogsf/Gs3.c
grass/branches/develbranch_6/lib/ogsf/Gv3.c
grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c
grass/branches/develbranch_6/lib/proj/convert.c
grass/branches/develbranch_6/lib/proj/get_proj.c
grass/branches/develbranch_6/lib/raster/io_sock.c
grass/branches/develbranch_6/lib/rst/interp_float/segmen2d.c
grass/branches/develbranch_6/lib/rst/interp_float/vinput2d.c
grass/branches/develbranch_6/lib/symbol/read.c
grass/branches/develbranch_6/lib/vector/Vlib/array.c
grass/branches/develbranch_6/lib/vector/Vlib/build_ogr.c
grass/branches/develbranch_6/lib/vector/Vlib/cats.c
grass/branches/develbranch_6/lib/vector/Vlib/cindex.c
grass/branches/develbranch_6/lib/vector/Vlib/field.c
grass/branches/develbranch_6/lib/vector/Vlib/intersect.c
grass/branches/develbranch_6/lib/vector/Vlib/legal_vname.c
grass/branches/develbranch_6/lib/vector/Vlib/map.c
grass/branches/develbranch_6/lib/vector/Vlib/net.c
grass/branches/develbranch_6/lib/vector/Vlib/open.c
grass/branches/develbranch_6/lib/vector/Vlib/open_nat.c
grass/branches/develbranch_6/lib/vector/Vlib/open_ogr.c
grass/branches/develbranch_6/lib/vector/Vlib/overlay.c
grass/branches/develbranch_6/lib/vector/Vlib/read.c
grass/branches/develbranch_6/lib/vector/Vlib/read_ogr.c
grass/branches/develbranch_6/lib/vector/Vlib/sindex.c
grass/branches/develbranch_6/lib/vector/Vlib/write_nat.c
grass/branches/develbranch_6/lib/vector/diglib/plus_area.c
grass/branches/develbranch_6/lib/vector/diglib/plus_node.c
grass/branches/develbranch_6/lib/vector/vedit/cats.c
grass/branches/develbranch_6/ps/ps.map/do_geogrid.c
grass/branches/develbranch_6/ps/ps.map/do_labels.c
grass/branches/develbranch_6/ps/ps.map/main.c
grass/branches/develbranch_6/ps/ps.map/ps_fclrtbl.c
grass/branches/develbranch_6/ps/ps.map/ps_vareas.c
grass/branches/develbranch_6/ps/ps.map/ps_vlines.c
grass/branches/develbranch_6/ps/ps.map/ps_vpoints.c
grass/branches/develbranch_6/ps/ps.map/r_vpoints.c
grass/branches/develbranch_6/raster/r.bilinear/main.c
grass/branches/develbranch_6/raster/r.carve/lobf.c
grass/branches/develbranch_6/raster/r.cats/main.c
grass/branches/develbranch_6/raster/r.clump/clump.c
grass/branches/develbranch_6/raster/r.colors/main.c
grass/branches/develbranch_6/raster/r.colors/rules.c
grass/branches/develbranch_6/raster/r.contour/main.c
grass/branches/develbranch_6/raster/r.cost/main.c
grass/branches/develbranch_6/raster/r.drain/main.c
grass/branches/develbranch_6/raster/r.flow/calc.c
grass/branches/develbranch_6/raster/r.flow/io.c
grass/branches/develbranch_6/raster/r.gwflow/main.c
grass/branches/develbranch_6/raster/r.in.ascii/gethead.c
grass/branches/develbranch_6/raster/r.in.bin/main.c
grass/branches/develbranch_6/raster/r.in.gdal/main.c
grass/branches/develbranch_6/raster/r.in.mat/main.c
grass/branches/develbranch_6/raster/r.in.xyz/main.c
grass/branches/develbranch_6/raster/r.kappa/calc_kappa.c
grass/branches/develbranch_6/raster/r.kappa/prt_mat.c
grass/branches/develbranch_6/raster/r.lake/main.c
grass/branches/develbranch_6/raster/r.li/r.li.daemon/daemon.c
grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c
grass/branches/develbranch_6/raster/r.los/main.c
grass/branches/develbranch_6/raster/r.mfilter.fp/main.c
grass/branches/develbranch_6/raster/r.mfilter/main.c
grass/branches/develbranch_6/raster/r.out.gdal/main.c
grass/branches/develbranch_6/raster/r.out.pov/main.c
grass/branches/develbranch_6/raster/r.out.vtk/main.c
grass/branches/develbranch_6/raster/r.out.vtk/writeascii.c
grass/branches/develbranch_6/raster/r.param.scale/interface.c
grass/branches/develbranch_6/raster/r.param.scale/process.c
grass/branches/develbranch_6/raster/r.profile/main.c
grass/branches/develbranch_6/raster/r.proj.seg/main.c
grass/branches/develbranch_6/raster/r.proj/main.c
grass/branches/develbranch_6/raster/r.quant/main.c
grass/branches/develbranch_6/raster/r.random.surface/main.c
grass/branches/develbranch_6/raster/r.random/main.c
grass/branches/develbranch_6/raster/r.random/random.c
grass/branches/develbranch_6/raster/r.reclass/main.c
grass/branches/develbranch_6/raster/r.reclass/parse.c
grass/branches/develbranch_6/raster/r.recode/main.c
grass/branches/develbranch_6/raster/r.recode/read_rules.c
grass/branches/develbranch_6/raster/r.resamp.rst/main.c
grass/branches/develbranch_6/raster/r.slope.aspect/main.c
grass/branches/develbranch_6/raster/r.statistics/main.c
grass/branches/develbranch_6/raster/r.stats/main.c
grass/branches/develbranch_6/raster/r.sun/main.c
grass/branches/develbranch_6/raster/r.sunmask/main.c
grass/branches/develbranch_6/raster/r.support/front/front.c
grass/branches/develbranch_6/raster/r.support/modhead/modhead.c
grass/branches/develbranch_6/raster/r.support/modhist/modhist.c
grass/branches/develbranch_6/raster/r.surf.fractal/interface.c
grass/branches/develbranch_6/raster/r.surf.idw2/main.c
grass/branches/develbranch_6/raster/r.texture/h_measure.c
grass/branches/develbranch_6/raster/r.texture/main.c
grass/branches/develbranch_6/raster/r.thin/io.c
grass/branches/develbranch_6/raster/r.thin/thin_lines.c
grass/branches/develbranch_6/raster/r.to.rast3/main.c
grass/branches/develbranch_6/raster/r.to.rast3elev/main.c
grass/branches/develbranch_6/raster/r.to.vect/lines.c
grass/branches/develbranch_6/raster/r.to.vect/main.c
grass/branches/develbranch_6/raster/r.topidx/main.c
grass/branches/develbranch_6/raster/r.walk/main.c
grass/branches/develbranch_6/raster/r.water.outlet/main.c
grass/branches/develbranch_6/raster/r.watershed/seg/init_vars.c
grass/branches/develbranch_6/raster/r.watershed/shed/basin_maps.c
grass/branches/develbranch_6/raster/r.watershed/shed/com_line.c
grass/branches/develbranch_6/raster/r.watershed/shed/intro.c
grass/branches/develbranch_6/raster/r.watershed/shed/main.c
grass/branches/develbranch_6/raster/simwe/r.sim.water/main.c
grass/branches/develbranch_6/raster/simwe/simlib/input.c
grass/branches/develbranch_6/raster/wildfire/r.ros/main.c
grass/branches/develbranch_6/raster3d/base/r3.mask.main.c
grass/branches/develbranch_6/raster3d/r3.cross.rast/main.c
grass/branches/develbranch_6/raster3d/r3.gwflow/main.c
grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c
grass/branches/develbranch_6/raster3d/r3.out.vtk/main.c
grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKData.c
grass/branches/develbranch_6/raster3d/r3.stats/main.c
grass/branches/develbranch_6/raster3d/r3.to.rast/main.c
grass/branches/develbranch_6/vector/lidar/v.lidar.correction/correction.c
grass/branches/develbranch_6/vector/lidar/v.lidar.correction/main.c
grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/edgedetection.c
grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/main.c
grass/branches/develbranch_6/vector/lidar/v.lidar.growing/main.c
grass/branches/develbranch_6/vector/lidar/v.outlier/main.c
grass/branches/develbranch_6/vector/lidar/v.outlier/outlier.c
grass/branches/develbranch_6/vector/lidar/v.surf.bspline/crosscorr.c
grass/branches/develbranch_6/vector/lidar/v.surf.bspline/main.c
grass/branches/develbranch_6/vector/v.buffer/main.c
grass/branches/develbranch_6/vector/v.build/main.c
grass/branches/develbranch_6/vector/v.category/main.c
grass/branches/develbranch_6/vector/v.clean/main.c
grass/branches/develbranch_6/vector/v.clean/prune.c
grass/branches/develbranch_6/vector/v.convert/att.c
grass/branches/develbranch_6/vector/v.convert/old2new.c
grass/branches/develbranch_6/vector/v.db.connect/main.c
grass/branches/develbranch_6/vector/v.digit/main.c
grass/branches/develbranch_6/vector/v.distance/main.c
grass/branches/develbranch_6/vector/v.drape/main.c
grass/branches/develbranch_6/vector/v.edit/a2b.c
grass/branches/develbranch_6/vector/v.edit/main.c
grass/branches/develbranch_6/vector/v.generalize/main.c
grass/branches/develbranch_6/vector/v.hull/main.c
grass/branches/develbranch_6/vector/v.in.ascii/a2b.c
grass/branches/develbranch_6/vector/v.in.ascii/in.c
grass/branches/develbranch_6/vector/v.in.ascii/points.c
grass/branches/develbranch_6/vector/v.in.db/main.c
grass/branches/develbranch_6/vector/v.in.ogr/geom.c
grass/branches/develbranch_6/vector/v.in.ogr/main.c
grass/branches/develbranch_6/vector/v.in.sites/main.c
grass/branches/develbranch_6/vector/v.info/main.c
grass/branches/develbranch_6/vector/v.kcv/main.c
grass/branches/develbranch_6/vector/v.kernel/main.c
grass/branches/develbranch_6/vector/v.label.sa/font.c
grass/branches/develbranch_6/vector/v.label/main.c
grass/branches/develbranch_6/vector/v.lrs/v.lrs.create/main.c
grass/branches/develbranch_6/vector/v.lrs/v.lrs.segment/main.c
grass/branches/develbranch_6/vector/v.mapcalc/number.c
grass/branches/develbranch_6/vector/v.net.alloc/main.c
grass/branches/develbranch_6/vector/v.net.iso/main.c
grass/branches/develbranch_6/vector/v.net/main.c
grass/branches/develbranch_6/vector/v.net/report.c
grass/branches/develbranch_6/vector/v.out.ascii/out.c
grass/branches/develbranch_6/vector/v.out.ogr/main.c
grass/branches/develbranch_6/vector/v.out.vtk/main.c
grass/branches/develbranch_6/vector/v.out.vtk/writeVTK.c
grass/branches/develbranch_6/vector/v.overlay/main.c
grass/branches/develbranch_6/vector/v.patch/main.c
grass/branches/develbranch_6/vector/v.perturb/main.c
grass/branches/develbranch_6/vector/v.proj/main.c
grass/branches/develbranch_6/vector/v.random/main.c
grass/branches/develbranch_6/vector/v.reclass/main.c
grass/branches/develbranch_6/vector/v.sample/main.c
grass/branches/develbranch_6/vector/v.segment/main.c
grass/branches/develbranch_6/vector/v.surf.idw/main.c
grass/branches/develbranch_6/vector/v.surf.rst/main.c
grass/branches/develbranch_6/vector/v.to.db/main.c
grass/branches/develbranch_6/vector/v.to.db/parse.c
grass/branches/develbranch_6/vector/v.to.db/query.c
grass/branches/develbranch_6/vector/v.to.db/report.c
grass/branches/develbranch_6/vector/v.to.db/update.c
grass/branches/develbranch_6/vector/v.to.rast/do_lines.c
grass/branches/develbranch_6/vector/v.to.rast/main.c
grass/branches/develbranch_6/vector/v.to.rast/support.c
grass/branches/develbranch_6/vector/v.to.rast/vect2rast.c
grass/branches/develbranch_6/vector/v.transform/main.c
grass/branches/develbranch_6/vector/v.transform/trans_digit.c
grass/branches/develbranch_6/vector/v.univar/main.c
grass/branches/develbranch_6/vector/v.vol.rst/main.c
grass/branches/develbranch_6/vector/v.vol.rst/user1.c
grass/branches/develbranch_6/vector/v.what.rast/main.c
grass/branches/develbranch_6/visualization/nviz/src/nviz_init.c
grass/branches/develbranch_6/visualization/nviz2/cmd/args.c
grass/branches/develbranch_6/visualization/nviz2/cmd/main.c
grass/branches/develbranch_6/visualization/nviz2/cmd/surface.c
Log:
fixed unlucky formatted messages (thanks to Glynn)
Modified: grass/branches/develbranch_6/db/base/copy.c
===================================================================
--- grass/branches/develbranch_6/db/base/copy.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/db/base/copy.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -107,8 +107,7 @@
/* Check options and copy tables */
if (from_table->answer) {
if (select->answer)
- G_fatal_error(_
- ("Cannot combine 'from_table' and 'select' options"));
+ G_fatal_error(_("Cannot combine 'from_table' and 'select' options"));
if (where->answer) {
ret =
@@ -126,8 +125,7 @@
}
else {
if (!select->answer)
- G_fatal_error(_
- ("Either 'from_table' or 'select' option must be given."));
+ G_fatal_error(_("Either 'from_table' or 'select' option must be given."));
if (where->answer)
G_fatal_error(_("Cannot combine 'select' and 'where' options"));
Modified: grass/branches/develbranch_6/db/drivers/ogr/describe.c
===================================================================
--- grass/branches/develbranch_6/db/drivers/ogr/describe.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/db/drivers/ogr/describe.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -90,8 +90,7 @@
if (ogrType != OFTInteger && ogrType != OFTReal &&
ogrType != OFTString) {
- G_warning(_
- ("OGR driver: column '%s', OGR type %d is not supported"),
+ G_warning(_("OGR driver: column '%s', OGR type %d is not supported"),
fieldName, ogrType);
cols[i] = 0;
}
@@ -151,8 +150,7 @@
sqlType = DB_SQL_TYPE_CHARACTER;
size = OGR_Fld_GetWidth(hFieldDefn);
if (size == 0) {
- G_warning(_
- ("column '%s', type 'string': unknown width -> stored as varchar(250) "
+ G_warning(_("column '%s', type 'string': unknown width -> stored as varchar(250) "
"some data may be lost"), fieldName);
size = 250;
}
Modified: grass/branches/develbranch_6/db/drivers/postgres/describe.c
===================================================================
--- grass/branches/develbranch_6/db/drivers/postgres/describe.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/db/drivers/postgres/describe.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -100,35 +100,30 @@
/* PG types defined in globals.h (and pg_type.h) */
if (sqltype == DB_SQL_TYPE_UNKNOWN) {
if (gpgtype == PG_TYPE_POSTGIS_GEOM) {
- G_warning(_
- ("pg driver: PostGIS column '%s', type 'geometry' will not be converted"),
+ G_warning(_("pg driver: PostGIS column '%s', type 'geometry' will not be converted"),
fname);
continue;
}
else {
/* Warn, ignore and continue */
- G_warning(_
- ("pg driver: column '%s', type %d is not supported"),
+ G_warning(_("pg driver: column '%s', type %d is not supported"),
fname, pgtype);
continue;
}
}
if (gpgtype == PG_TYPE_INT8)
- G_warning(_
- ("column '%s' : type int8 (bigint) is stored as integer (4 bytes) "
+ G_warning(_("column '%s' : type int8 (bigint) is stored as integer (4 bytes) "
"some data may be damaged"), fname);
if (gpgtype == PG_TYPE_VARCHAR && fsize < 0) {
- G_warning(_
- ("column '%s' : type character varying is stored as varchar(250) "
+ G_warning(_("column '%s' : type character varying is stored as varchar(250) "
"some data may be lost"), fname);
fsize = 250;
}
if (gpgtype == PG_TYPE_BOOL)
- G_warning(_
- ("column '%s' : type bool (boolean) is stored as char(1), values: 0 (false), "
+ G_warning(_("column '%s' : type bool (boolean) is stored as char(1), values: 0 (false), "
"1 (true)"), fname);
column = db_get_table_column(*table, kcols);
Modified: grass/branches/develbranch_6/db/drivers/postgres/parse.c
===================================================================
--- grass/branches/develbranch_6/db/drivers/postgres/parse.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/db/drivers/postgres/parse.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -52,18 +52,15 @@
else if (strncmp(tokens[i], "dbname", 6) == 0)
pgconn->dbname = G_store(tokens[i] + 7);
else if (strncmp(tokens[i], "user", 4) == 0)
- G_warning(_
- ("'user' in database definition is not supported, use db.login"));
+ G_warning(_("'user' in database definition is not supported, use db.login"));
/* pgconn->user = G_store ( tokens[i] + 5 ); */
else if (strncmp(tokens[i], "password", 8) == 0)
/* pgconn->password = G_store ( tokens[i] + 9 ); */
- G_warning(_
- ("'password' in database definition is not supported, use db.login"));
+ G_warning(_("'password' in database definition is not supported, use db.login"));
else if (strncmp(tokens[i], "schema", 6) == 0)
pgconn->schema = G_store(tokens[i] + 7);
else {
- append_error(_
- ("Unknown option in database definition for PostgreSQL: "));
+ append_error(_("Unknown option in database definition for PostgreSQL: "));
append_error(tokens[i]);
return DB_FAILED;
}
Modified: grass/branches/develbranch_6/db/drivers/sqlite/describe.c
===================================================================
--- grass/branches/develbranch_6/db/drivers/sqlite/describe.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/db/drivers/sqlite/describe.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -156,8 +156,7 @@
if (sqltype == DB_SQL_TYPE_UNKNOWN) {
/* Warn, ignore and continue */
- G_warning(_
- ("SQLite driver: column '%s', SQLite type %d is not supported"),
+ G_warning(_("SQLite driver: column '%s', SQLite type %d is not supported"),
fname, litetype);
continue;
}
Modified: grass/branches/develbranch_6/display/d.barscale/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.barscale/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.barscale/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -116,8 +116,7 @@
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)
Modified: grass/branches/develbranch_6/display/d.extract/extract.c
===================================================================
--- grass/branches/develbranch_6/display/d.extract/extract.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.extract/extract.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -43,8 +43,7 @@
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"));
Modified: grass/branches/develbranch_6/display/d.font/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.font/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.font/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -123,8 +123,7 @@
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);
}
Modified: grass/branches/develbranch_6/display/d.grid/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.grid/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.grid/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -134,11 +134,9 @@
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;
Modified: grass/branches/develbranch_6/display/d.grid/plot.c
===================================================================
--- grass/branches/develbranch_6/display/d.grid/plot.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.grid/plot.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -291,16 +291,14 @@
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 @@
* 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 @@
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);
Modified: grass/branches/develbranch_6/display/d.legend/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.legend/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.legend/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -338,8 +338,7 @@
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)
@@ -354,8 +353,7 @@
/* 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);
@@ -371,15 +369,13 @@
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"));
}
}
@@ -436,8 +432,7 @@
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);
}
@@ -478,8 +473,7 @@
/* 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 */
@@ -489,8 +483,7 @@
/* 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;
}
}
@@ -534,21 +527,18 @@
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)
Modified: grass/branches/develbranch_6/display/d.linegraph/linegraph.c
===================================================================
--- grass/branches/develbranch_6/display/d.linegraph/linegraph.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.linegraph/linegraph.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -288,8 +288,7 @@
}
}
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"));
Modified: grass/branches/develbranch_6/display/d.nviz/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.nviz/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.nviz/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -143,8 +143,7 @@
/* check arguments */
if ((!parm.i->answer) && (!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);
@@ -535,8 +534,7 @@
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;
Modified: grass/branches/develbranch_6/display/d.paint.labels/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.paint.labels/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.paint.labels/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -99,8 +99,7 @@
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."));
D_add_to_list(G_recreate_command());
R_close_driver();
exit(0);
@@ -109,8 +108,7 @@
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."));
D_add_to_list(G_recreate_command());
R_close_driver();
exit(0);
Modified: grass/branches/develbranch_6/display/d.path/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.path/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.path/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -182,8 +182,7 @@
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;
Modified: grass/branches/develbranch_6/display/d.profile/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.profile/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.profile/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -103,8 +103,7 @@
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 @@
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,
Modified: grass/branches/develbranch_6/display/d.rast/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.rast/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.rast/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -116,15 +116,13 @@
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);
}
Modified: grass/branches/develbranch_6/display/d.rast.arrow/arrow.c
===================================================================
--- grass/branches/develbranch_6/display/d.rast.arrow/arrow.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.rast.arrow/arrow.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -230,8 +230,7 @@
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)
Modified: grass/branches/develbranch_6/display/d.text.freetype/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.text.freetype/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.text.freetype/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -643,8 +643,7 @@
sprintf(file, "%s/etc/freetypecap", G_gisbase());
if (capfile) {
if (access(capfile, R_OK))
- G_warning(_
- ("%s: Unable to read FreeType definition file; use the default"),
+ G_warning(_("%s: Unable to read FreeType definition file; use the default"),
capfile);
else
ptr = capfile;
Modified: grass/branches/develbranch_6/display/d.thematic.area/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.thematic.area/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.thematic.area/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -190,8 +190,7 @@
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 */
@@ -294,8 +293,7 @@
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);
@@ -328,8 +326,7 @@
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;
}
Modified: grass/branches/develbranch_6/display/d.thematic.area/plot1.c
===================================================================
--- grass/branches/develbranch_6/display/d.thematic.area/plot1.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.thematic.area/plot1.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -362,16 +362,14 @@
}
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 @@
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;
Modified: grass/branches/develbranch_6/display/d.vect/area.c
===================================================================
--- grass/branches/develbranch_6/display/d.vect/area.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.vect/area.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -274,15 +274,13 @@
}
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 @@
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;
Modified: grass/branches/develbranch_6/display/d.vect/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.vect/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.vect/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -407,8 +407,7 @@
minreg = atof(minreg_opt->answer);
if (reg < minreg) {
- G_message(_
- ("Region size is lower than minreg, nothing displayed."));
+ G_message(_("Region size is lower than minreg, nothing displayed."));
D_add_to_list(G_recreate_command());
exit(EXIT_SUCCESS);
}
@@ -417,8 +416,7 @@
maxreg = atof(maxreg_opt->answer);
if (reg > maxreg) {
- G_message(_
- ("Region size is greater than maxreg, nothing displayed."));
+ G_message(_("Region size is greater than maxreg, nothing displayed."));
D_add_to_list(G_recreate_command());
exit(EXIT_SUCCESS);
}
@@ -643,8 +641,7 @@
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;
}
@@ -683,8 +680,7 @@
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,
Modified: grass/branches/develbranch_6/display/d.vect/plot1.c
===================================================================
--- grass/branches/develbranch_6/display/d.vect/plot1.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.vect/plot1.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -381,16 +381,14 @@
}
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 @@
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;
Modified: grass/branches/develbranch_6/display/d.where/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.where/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/display/d.where/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -93,20 +93,17 @@
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 @@
* 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 @@
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);
Modified: grass/branches/develbranch_6/doc/vector/v.example/main.c
===================================================================
--- grass/branches/develbranch_6/doc/vector/v.example/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/doc/vector/v.example/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -173,8 +173,7 @@
/* 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;
}
Modified: grass/branches/develbranch_6/general/g.access/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.access/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/g.access/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -61,8 +61,7 @@
/* 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)
Modified: grass/branches/develbranch_6/general/g.findfile/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.findfile/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/g.findfile/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -71,8 +71,7 @@
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);
Modified: grass/branches/develbranch_6/general/g.mapset/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.mapset/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/g.mapset/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -147,8 +147,7 @@
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;
@@ -171,8 +170,7 @@
/* 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());
/* Erase monitors */
@@ -206,8 +204,7 @@
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")) {
Modified: grass/branches/develbranch_6/general/g.proj/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.proj/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/g.proj/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -180,8 +180,7 @@
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 */
Modified: grass/branches/develbranch_6/general/g.proj/output.c
===================================================================
--- grass/branches/develbranch_6/general/g.proj/output.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/g.proj/output.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -171,8 +171,7 @@
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);
@@ -204,8 +203,7 @@
" GRASS will not re-project your data automatically\n\n");
if (G_yes
- (_
- ("Would you still like to overwrite the current projection information "),
+ (_("Would you still like to overwrite the current projection information "),
0))
go_ahead = 1;
}
@@ -243,8 +241,7 @@
* 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."));
}
Modified: grass/branches/develbranch_6/general/g.region/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.region/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/g.region/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -450,8 +450,7 @@
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));
Modified: grass/branches/develbranch_6/general/g.region/printwindow.c
===================================================================
--- grass/branches/develbranch_6/general/g.region/printwindow.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/g.region/printwindow.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -240,16 +240,13 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
*/
}
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"));
}
}
Modified: grass/branches/develbranch_6/general/g.setproj/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.setproj/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/g.setproj/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -84,8 +84,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
_
("\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);
Modified: grass/branches/develbranch_6/general/manage/cmd/remove.c
===================================================================
--- grass/branches/develbranch_6/general/manage/cmd/remove.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/manage/cmd/remove.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -38,8 +38,7 @@
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 @@
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 @@
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);
}
Modified: grass/branches/develbranch_6/general/manage/cmd/rename.c
===================================================================
--- grass/branches/develbranch_6/general/manage/cmd/rename.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/general/manage/cmd/rename.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -85,8 +85,7 @@
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;
}
Modified: grass/branches/develbranch_6/imagery/i.cca/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.cca/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.cca/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -142,8 +142,7 @@
/* check the number of input bands */
bands = refs.nfiles;
if (bands > MX - 1)
- G_fatal_error(_
- ("Subgroup too large. Maximum number of bands is %d\n."),
+ G_fatal_error(_("Subgroup too large. Maximum number of bands is %d\n."),
MX - 1);
/*
Modified: grass/branches/develbranch_6/imagery/i.class/add_point.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.class/add_point.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.class/add_point.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -19,8 +19,7 @@
return (1);
if (Region.npoints >= MAX_VERTEX) {
- G_warning(_
- ("Can't mark another point. Only %d points allowed. Sorry."),
+ G_warning(_("Can't mark another point. Only %d points allowed. Sorry."),
MAX_VERTEX);
return (0);
}
Modified: grass/branches/develbranch_6/imagery/i.class/complete_reg.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.class/complete_reg.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.class/complete_reg.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -9,8 +9,7 @@
int complete_region(void)
{
if (Region.npoints < 3)
- G_warning(_
- ("Too few points for region. Must have at least 3 points."));
+ G_warning(_("Too few points for region. Must have at least 3 points."));
else if (Region.area.completed)
G_warning(_("Area already completed."));
else {
Modified: grass/branches/develbranch_6/imagery/i.class/readbands.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.class/readbands.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.class/readbands.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -9,8 +9,7 @@
for (i = 0; i < nbands; i++)
if (G_get_map_row_nomask(Bandfd[i], Bandbuf[i], cur) < 0)
- G_fatal_error(_
- ("Error reading raster map in function readbands."));
+ G_fatal_error(_("Error reading raster map in function readbands."));
return 0;
}
Modified: grass/branches/develbranch_6/imagery/i.class/signature.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.class/signature.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.class/signature.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -47,14 +47,12 @@
(Band_sum = (float *)G_calloc(nbands, sizeof(float))) == NULL ||
(Band_product = (float **)G_calloc(nbands, sizeof(float *))) == NULL
|| (Band_histo = (int **)G_calloc(nbands, sizeof(int *))) == NULL)
- G_fatal_error(_
- ("Unable to allocate space for signature statistics."));
+ G_fatal_error(_("Unable to allocate space for signature statistics."));
for (i = 0; i < nbands; i++) {
if ((Band_product[i] =
(float *)G_calloc(nbands, sizeof(float))) == NULL ||
(Band_histo[i] = (int *)G_calloc(MAX_CATS, sizeof(int))) == NULL)
- G_fatal_error(_
- ("Unable to allocate space for signature statistics."));
+ G_fatal_error(_("Unable to allocate space for signature statistics."));
}
return 0;
@@ -112,8 +110,7 @@
y = P[i].y;
if (y != P[i - 1].y) {
- G_warning(_
- ("prepare_signature: scan line %d has odd number of points."),
+ G_warning(_("prepare_signature: scan line %d has odd number of points."),
(i + 1) / 2);
return (0);
}
@@ -278,8 +275,7 @@
if ((fd = G_open_cell_new(MASK)) < 0)
G_fatal_error(_("Unable to open the cell map MASK."));
if ((buffer = G_allocate_cell_buf()) == NULL)
- G_fatal_error(_
- ("Unable to allocate the cell buffer in display_signature()."));
+ G_fatal_error(_("Unable to allocate the cell buffer in display_signature()."));
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/branches/develbranch_6/imagery/i.cluster/checkpt.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.cluster/checkpt.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.cluster/checkpt.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -37,8 +37,7 @@
if (verbose) {
cur_time = time(NULL);
elapsed_time = cur_time - start_time;
- G_message(_
- ("Iteration %d: %% Convergence: %.2f (%s elapsed, %s left)"),
+ G_message(_("Iteration %d: %% Convergence: %.2f (%s elapsed, %s left)"),
X->iteration, (double)X->percent_stable,
print_time(elapsed_time),
print_time(iters * elapsed_time / (X->iteration + 1) -
Modified: grass/branches/develbranch_6/imagery/i.cluster/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.cluster/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.cluster/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -310,8 +310,7 @@
for (n = 0; n < ref.nfiles; n++)
x[n] = cell[n][col];
if (I_cluster_point(&C, x) < 0)
- G_fatal_error(_
- ("Out of Memory. Please run again and choose a smaller sample size"));
+ G_fatal_error(_("Out of Memory. Please run again and choose a smaller sample size"));
}
}
if (verbose)
Modified: grass/branches/develbranch_6/imagery/i.fft/fftmain.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.fft/fftmain.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.fft/fftmain.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -160,8 +160,7 @@
data[0] = (double *)G_malloc((rows * cols) * sizeof(double));
data[1] = (double *)G_malloc((rows * cols) * sizeof(double));
if (data[0] == NULL || data[1] == NULL)
- G_fatal_error(_
- ("Insufficent memory for allocation of data structure"));
+ G_fatal_error(_("Insufficent memory for allocation of data structure"));
/* Initialize real & complex components to zero */
G_message(_("Initializing data...\n"));
Modified: grass/branches/develbranch_6/imagery/i.gensig/get_train.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.gensig/get_train.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.gensig/get_train.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -50,8 +50,7 @@
n++;
}
else
- G_warning(_
- ("Training class [%d] only has one cell - this class will be ignored."),
+ G_warning(_("Training class [%d] only has one cell - this class will be ignored."),
cat);
}
Modified: grass/branches/develbranch_6/imagery/i.gensig/openfiles.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.gensig/openfiles.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.gensig/openfiles.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -13,8 +13,7 @@
if (!I_get_subgroup_ref(parms->group, parms->subgroup, &Ref))
- G_fatal_error(_
- ("Unable to read REF file for subgroup [%s] in group [%s]."),
+ G_fatal_error(_("Unable to read REF file for subgroup [%s] in group [%s]."),
parms->subgroup, parms->group);
if (Ref.nfiles <= 0)
Modified: grass/branches/develbranch_6/imagery/i.group/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.group/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.group/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -121,8 +121,7 @@
/* Remove files from Group */
if (I_find_group(group) == 0) {
- G_fatal_error(_
- ("Specified group does not exist in current mapset"));
+ G_fatal_error(_("Specified group does not exist in current mapset"));
}
if (sgrp->answer) {
@@ -143,8 +142,7 @@
struct Ref ref;
if (I_find_group(group) == 0) {
- G_fatal_error(_
- ("Specified group does not exist in current mapset"));
+ G_fatal_error(_("Specified group does not exist in current mapset"));
}
if (sgrp->answer) {
@@ -167,8 +165,7 @@
else {
/* Create or update Group REF */
if (I_find_group(group) == 0)
- G_verbose_message(_
- ("Group <%s> does not yet exist. Creating..."),
+ G_verbose_message(_("Group <%s> does not yet exist. Creating..."),
group);
if (sgrp->answer) {
@@ -253,8 +250,7 @@
/* Go through existing files to check for duplicates */
for (n = 0; n < ref.nfiles; n++) {
if (strcmp(rasters[m], ref.file[n].name) == 0) {
- G_message(_
- ("Raster map <%s> exists in subgroup. Skipping..."),
+ G_message(_("Raster map <%s> exists in subgroup. Skipping..."),
G_fully_qualified_name(rasters[m], mapset));
skip = 1;
continue;
Modified: grass/branches/develbranch_6/imagery/i.ifft/ifftmain.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ifft/ifftmain.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.ifft/ifftmain.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -94,8 +94,7 @@
if ((realfp =
G_fopen_old_misc("cell_misc", "fftreal", Cellmap_real,
realmapset)) == NULL)
- G_fatal_error(_
- ("Unable to open real-image in the cell_misc directory.\nInput map probably wasn't created by i.fft"));
+ G_fatal_error(_("Unable to open real-image in the cell_misc directory.\nInput map probably wasn't created by i.fft"));
if ((imagmapset = G_find_cell(Cellmap_imag, "")) == NULL)
G_fatal_error(_("%s: %s - Unable to find the imaginary-image."),
@@ -104,8 +103,7 @@
if ((imagfp =
G_fopen_old_misc("cell_misc", "fftimag", Cellmap_imag,
imagmapset)) == NULL)
- G_fatal_error(_
- ("Unable to open imaginary-image in the cell_misc directory.\nInput map probably wasn't created by i.fft"));
+ G_fatal_error(_("Unable to open imaginary-image in the cell_misc directory.\nInput map probably wasn't created by i.fft"));
/* check command line args for validity */
if (G_legal_filename(Cellmap_orig) < 0)
@@ -135,8 +133,7 @@
data[0] = (double *)G_malloc((rows * cols) * sizeof(double));
data[1] = (double *)G_malloc((rows * cols) * sizeof(double));
if (data[0] == NULL || data[1] == NULL)
- G_fatal_error(_
- ("Insufficent memory for allocation of data structure"));
+ G_fatal_error(_("Insufficent memory for allocation of data structure"));
/* Initialize real & complex components to zero */
G_message(_("Reading the raster maps..."));
Modified: grass/branches/develbranch_6/imagery/i.ifft/orig_wind.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ifft/orig_wind.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.ifft/orig_wind.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -24,8 +24,7 @@
hd->east != tmphd.east ||
hd->west != tmphd.west ||
hd->ew_res != tmphd.ew_res || hd->ns_res != tmphd.ns_res)
- G_fatal_error(_
- ("The real and imaginary original windows did not match."));
+ G_fatal_error(_("The real and imaginary original windows did not match."));
return 0;
}
Modified: grass/branches/develbranch_6/imagery/i.maxlik/invert.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.maxlik/invert.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.maxlik/invert.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -25,12 +25,10 @@
stat = invert(s = &S.sig[c], S.nbands, ik, jk, &det);
if (stat != 1) {
if (stat)
- G_warning(_
- ("signature %d is not valid (ill-conditioned) - ignored."),
+ G_warning(_("signature %d is not valid (ill-conditioned) - ignored."),
c + 1);
else
- G_warning(_
- ("signature %d is not valid (singular) - ignored."),
+ G_warning(_("signature %d is not valid (singular) - ignored."),
c + 1);
bad = 1;
Modified: grass/branches/develbranch_6/imagery/i.maxlik/open.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.maxlik/open.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.maxlik/open.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -23,8 +23,7 @@
if (Ref.nfiles <= 1) {
if (Ref.nfiles <= 0)
- G_fatal_error(_
- ("Subgroup [%s] of group [%s] doesn't have any files.\n"
+ G_fatal_error(_("Subgroup [%s] of group [%s] doesn't have any files.\n"
"The subgroup must have at least 2 files."));
else
G_fatal_error(_("Subgroup [%s] of group [%s] only has 1 file.\n"
Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/write.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/write.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/write.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -63,8 +63,7 @@
G_fatal_error(_("Unable to write row %d"), row);
if (G_put_raster_row(fd, rast, map_type) < 0) {
- G_fatal_error(_
- ("Unable to write raster map. You might want to check available disk space and write permissions."));
+ G_fatal_error(_("Unable to write raster map. You might want to check available disk space and write permissions."));
unlink(temp_name);
}
}
Modified: grass/branches/develbranch_6/imagery/i.pca/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.pca/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.pca/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -203,8 +203,7 @@
if (*scale_min == 0)
*scale = 0;
else {
- G_warning(_
- ("Scale range length should be > 0. Using default values: 0,255"));
+ G_warning(_("Scale range length should be > 0. Using default values: 0,255"));
*scale_min = 0;
*scale_max = 255;
}
@@ -422,8 +421,7 @@
if (rowbuf)
G_free(rowbuf);
if (!(rowbuf = G_allocate_raster_buf(maptype)))
- G_fatal_error(_
- ("Cannot allocate memory for row buffer"));
+ G_fatal_error(_("Cannot allocate memory for row buffer"));
if (G_get_raster_row(inp_fd[j], rowbuf, row, maptype) < 0)
G_fatal_error(_("Cannot read raster row [%d]"), row);
Modified: grass/branches/develbranch_6/imagery/i.rectify/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.rectify/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.rectify/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -116,8 +116,7 @@
G_fatal_error(_("Group <%s> does not exist"), grp->answer);
if (ref.nfiles <= 0) {
- G_important_message(_
- ("Group <%s> contains no raster maps; run i.group"),
+ G_important_message(_("Group <%s> contains no raster maps; run i.group"),
grp->answer);
exit(EXIT_SUCCESS);
}
Modified: grass/branches/develbranch_6/imagery/i.smap/bouman/model.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.smap/bouman/model.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.smap/bouman/model.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -35,8 +35,7 @@
for (b1 = 0; b1 < nbands; b1++)
for (b2 = 0; b2 < nbands; b2++) {
if (SubS->R[b1][b2] != SubS->R[b2][b1])
- G_warning(_
- ("\nNonsymetric covariance for class [%d] subclass [%d]."),
+ G_warning(_("\nNonsymetric covariance for class [%d] subclass [%d]."),
m + 1, i + 1);
SubS->Rinv[b1][b2] = SubS->R[b1][b2];
@@ -46,8 +45,7 @@
eigen(SubS->Rinv, lambda, nbands);
for (b1 = 0; b1 < nbands; b1++) {
if (lambda[b1] <= 0.0)
- G_warning(_
- ("Nonpositive eigenvalues for class [%d] subclass [%d]."),
+ G_warning(_("Nonpositive eigenvalues for class [%d] subclass [%d]."),
m + 1, i + 1);
}
Modified: grass/branches/develbranch_6/imagery/i.smap/shapiro/openfiles.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.smap/shapiro/openfiles.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.smap/shapiro/openfiles.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -12,8 +12,7 @@
if (!I_get_subgroup_ref(parms->group, parms->subgroup, &Ref))
- G_fatal_error(_
- ("Unable to read REF file for subgroup [%s] in group [%s]."),
+ G_fatal_error(_("Unable to read REF file for subgroup [%s] in group [%s]."),
parms->subgroup, parms->group);
if (Ref.nfiles <= 0)
Modified: grass/branches/develbranch_6/imagery/i.smap/shapiro/read_sig.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.smap/shapiro/read_sig.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.smap/shapiro/read_sig.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -10,8 +10,7 @@
struct Ref Ref;
if (!I_get_subgroup_ref(parms->group, parms->subgroup, &Ref))
- G_fatal_error(_
- ("Unable to read REF file for subgroup [%s] in group [%s]."),
+ G_fatal_error(_("Unable to read REF file for subgroup [%s] in group [%s]."),
parms->subgroup, parms->group);
if (Ref.nfiles <= 0)
Modified: grass/branches/develbranch_6/imagery/i.zc/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.zc/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/imagery/i.zc/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -153,8 +153,7 @@
data[0] = (double *)G_malloc(totsize * sizeof(double));
data[1] = (double *)G_malloc(totsize * sizeof(double));
if (data[0] == NULL || data[1] == NULL)
- G_fatal_error(_
- ("Insufficent memory for allocation of data structure"));
+ G_fatal_error(_("Insufficent memory for allocation of data structure"));
/* Initialize real & complex components to zero */
G_message(_("Initializing data..."));
Modified: grass/branches/develbranch_6/lib/arraystats/class.c
===================================================================
--- grass/branches/develbranch_6/lib/arraystats/class.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/arraystats/class.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -192,8 +192,7 @@
}
if (j < (*nbreaks)) {
- G_warning(_
- ("There are classbreaks outside the range min-max. Number of classes reduced to %i, but using probabilities for %i classes."),
+ G_warning(_("There are classbreaks outside the range min-max. Number of classes reduced to %i, but using probabilities for %i classes."),
j + 1, *nbreaks + 1);
G_realloc(classbreaks, j * sizeof(double));
for (i = 0; i < j; i++)
@@ -388,8 +387,7 @@
chi2 = pow((double)((no1 - no2) - (xt1 - xt2)), 2) / (xt1 + xt2);
if (chi2 < 3.84148) {
- G_warning(_
- ("discontinuities algorithm: %i class breaks or more are not statistically significant at alpha=0.05"),
+ G_warning(_("discontinuities algorithm: %i class breaks or more are not statistically significant at alpha=0.05"),
i);
maxclass = 1;
}
Modified: grass/branches/develbranch_6/lib/driver/parse_ftcap.c
===================================================================
--- grass/branches/develbranch_6/lib/driver/parse_ftcap.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/driver/parse_ftcap.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -29,8 +29,7 @@
fp = NULL;
if ((capfile = getenv("GRASS_FONT_CAP"))) {
if ((fp = fopen(capfile, "r")) == NULL)
- G_warning(_
- ("%s: Unable to read font definition file; use the default"),
+ G_warning(_("%s: Unable to read font definition file; use the default"),
capfile);
}
if (fp == NULL) {
Modified: grass/branches/develbranch_6/lib/g3d/g3dopen.c
===================================================================
--- grass/branches/develbranch_6/lib/g3d/g3dopen.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/g3d/g3dopen.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -121,8 +121,7 @@
window = G3d_windowPtr();
if (proj != window->proj) {
- G3d_error(_
- ("G3d_openCellOld: projection does not match window projection"));
+ G3d_error(_("G3d_openCellOld: projection does not match window projection"));
return (void *)NULL;
}
if (zone != window->zone) {
@@ -144,8 +143,7 @@
/* if our long is to short to store offsets we can't read the file */
if (map->indexNbytesUsed > sizeof(long))
- G3d_fatalError(_
- ("G3d_openCellOld: index does not fit into long"));
+ G3d_fatalError(_("G3d_openCellOld: index does not fit into long"));
ltmp = G3d_malloc(map->indexLongNbytes);
if (ltmp == NULL) {
Modified: grass/branches/develbranch_6/lib/g3d/g3dparam.c
===================================================================
--- grass/branches/develbranch_6/lib/g3d/g3dparam.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/g3d/g3dparam.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -146,8 +146,7 @@
if (strcmp(param->dimension->answer, "default") != 0) {
if (sscanf(param->dimension->answer, "%dx%dx%d",
tileX, tileY, tileZ) != 3) {
- G3d_error(_
- ("G3d_getStandard3dParams: tile dimension value invalid"));
+ G3d_error(_("G3d_getStandard3dParams: tile dimension value invalid"));
return 0;
}
}
Modified: grass/branches/develbranch_6/lib/gis/adj_cellhd.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/adj_cellhd.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/adj_cellhd.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -76,8 +76,7 @@
if (cellhd->north > 90.0) {
if (((cellhd->north - 90.0) < epsilon_ns) &&
((cellhd->north - 90.0) > GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of north boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of north boundary (%g>%g)"),
cellhd->north - 90.0, epsilon_ns);
cellhd->north = 90.0;
}
@@ -88,8 +87,7 @@
if (cellhd->south < -90.0) {
if (((cellhd->south + 90.0) < epsilon_ns) &&
((cellhd->south + 90.0) < GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of south boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of south boundary (%g>%g)"),
cellhd->south + 90.0, epsilon_ns);
cellhd->south = -90.0;
}
@@ -106,8 +104,7 @@
if ((cellhd->west < -180.0) && ((cellhd->west + 180.0) < epsilon_ew)
&& ((cellhd->west + 180.0) < GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of west boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of west boundary (%g>%g)"),
cellhd->west + 180.0, epsilon_ew);
cellhd->west = -180.0;
}
@@ -118,8 +115,7 @@
if ((cellhd->east > 180.0) && ((cellhd->east - 180.0) > epsilon_ew)
&& ((cellhd->east - 180.0) > GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of east boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of east boundary (%g>%g)"),
cellhd->east - 180.0, epsilon_ew);
cellhd->east = 180.0;
}
@@ -248,8 +244,7 @@
if (cellhd->north > 90.0) {
if (((cellhd->north - 90.0) < epsilon_ns) &&
((cellhd->north - 90.0) > GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of north boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of north boundary (%g>%g)"),
cellhd->north - 90.0, epsilon_ns);
cellhd->north = 90.0;
}
@@ -260,8 +255,7 @@
if (cellhd->south < -90.0) {
if (((cellhd->south + 90.0) < epsilon_ns) &&
((cellhd->south + 90.0) < GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of south boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of south boundary (%g>%g)"),
cellhd->south + 90.0, epsilon_ns);
cellhd->south = -90.0;
}
@@ -278,8 +272,7 @@
if ((cellhd->west < -180.0) && ((cellhd->west + 180.0) < epsilon_ew)
&& ((cellhd->west + 180.0) < GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of west boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of west boundary (%g>%g)"),
cellhd->west + 180.0, epsilon_ew);
cellhd->west = -180.0;
}
@@ -290,8 +283,7 @@
if ((cellhd->east > 180.0) && ((cellhd->east - 180.0) > epsilon_ew)
&& ((cellhd->east - 180.0) > GRASS_EPSILON)) {
- G_warning(_
- ("Fixing subtle input data rounding error of east boundary (%g>%g)"),
+ G_warning(_("Fixing subtle input data rounding error of east boundary (%g>%g)"),
cellhd->east - 180.0, epsilon_ew);
cellhd->east = 180.0;
}
Modified: grass/branches/develbranch_6/lib/gis/closecell.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/closecell.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/closecell.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -244,8 +244,7 @@
int cell_fd;
if (G__write_fp_format(fd) != 0) {
- G_warning(_
- ("Error writing floating point format file for map %s"),
+ G_warning(_("Error writing floating point format file for map %s"),
fcb->name);
stat = -1;
}
Modified: grass/branches/develbranch_6/lib/gis/get_ellipse.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/get_ellipse.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/get_ellipse.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -354,8 +354,7 @@
str = G_find_key_value("a", proj_keys);
if (str != NULL) {
if (sscanf(str, "%lf", a) != 1) {
- G_fatal_error(_
- ("Invalid a: field '%s' in file %s in <%s>"),
+ G_fatal_error(_("Invalid a: field '%s' in file %s in <%s>"),
str, PROJECTION_FILE, PERMANENT);
}
}
Modified: grass/branches/develbranch_6/lib/gis/get_row.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/get_row.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/get_row.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -43,8 +43,7 @@
/* check for row in window */
if (row < 0 || row >= G__.window.rows) {
- G_warning(_
- ("Reading raster map <%s@%s> request for row %d is outside region"),
+ G_warning(_("Reading raster map <%s@%s> request for row %d is outside region"),
fcb->name, fcb->mapset, row);
return -1;
@@ -299,8 +298,7 @@
while (cmapold++ != cmap[i]) /* skip */
if (!xdr_float(xdrs, &c[i]))
- G_fatal_error(_
- ("cell_values_float: xdr_float failed for index %d"),
+ G_fatal_error(_("cell_values_float: xdr_float failed for index %d"),
i);
cmapold--;
@@ -341,8 +339,7 @@
while (cmapold++ != cmap[i]) /* skip */
if (!xdr_double(xdrs, &c[i]))
- G_fatal_error(_
- ("cell_values_double: xdr_double failed for index %d"),
+ G_fatal_error(_("cell_values_double: xdr_double failed for index %d"),
i);
cmapold--;
@@ -489,8 +486,7 @@
if (!fcb->io_error) {
if (fcb->cellhd.compressed)
- G_warning(_
- ("Error reading compressed map <%s@%s>, row %d"),
+ G_warning(_("Error reading compressed map <%s@%s>, row %d"),
fcb->name, fcb->mapset, r);
else
G_warning(_("Error reading map <%s@%s>, row %d"),
@@ -918,8 +914,7 @@
int i, j, null_fd;
if (row > G__.window.rows || row < 0) {
- G_warning(_
- ("Reading raster map <%s@%s> request for row %d is outside region"),
+ G_warning(_("Reading raster map <%s@%s> request for row %d is outside region"),
fcb->name, fcb->mapset, row);
}
Modified: grass/branches/develbranch_6/lib/gis/gisinit.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/gisinit.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/gisinit.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -98,8 +98,7 @@
{
if (initialized)
return 1;
- G_warning(_
- ("System not initialized. Programmer forgot to call G_gisinit()."));
+ G_warning(_("System not initialized. Programmer forgot to call G_gisinit()."));
G_sleep(3);
exit(EXIT_FAILURE);
}
Modified: grass/branches/develbranch_6/lib/gis/history.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/history.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/history.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -260,8 +260,7 @@
cmdlen = strlen(cmdlin);
if (hist->edlinecnt > MAXEDLINES - 2) {
- G_warning(_
- ("Not enough room in history file to record command line."));
+ G_warning(_("Not enough room in history file to record command line."));
return 1;
}
@@ -283,8 +282,7 @@
j += 68;
hist->edlinecnt++;
if (hist->edlinecnt > MAXEDLINES - 2) {
- G_warning(_
- ("Not enough room in history file for command line (truncated)."));
+ G_warning(_("Not enough room in history file for command line (truncated)."));
return 2;
}
}
Modified: grass/branches/develbranch_6/lib/gis/legal_name.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/legal_name.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/legal_name.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -74,8 +74,7 @@
return 0; /* don't die on undefined parameters */
if (G_legal_filename(output) == -1) {
if (error == GR_FATAL_EXIT) {
- G_fatal_error(_
- ("Output raster map name <%s> is not valid map name"),
+ G_fatal_error(_("Output raster map name <%s> is not valid map name"),
output);
}
else if (error == GR_FATAL_PRINT) {
Modified: grass/branches/develbranch_6/lib/gis/opencell.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/opencell.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/opencell.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -258,8 +258,7 @@
r_name = reclass.name;
r_mapset = reclass.mapset;
if (G_find_cell2(r_name, r_mapset) == NULL) {
- G_warning(_
- ("unable to open [%s] in [%s] since it is a reclass of [%s] in [%s] which does not exist"),
+ G_warning(_("unable to open [%s] in [%s] since it is a reclass of [%s] in [%s] which does not exist"),
name, mapset, r_name, r_mapset);
return -1;
}
@@ -282,23 +281,20 @@
{
CELL_nbytes = cellhd.format + 1;
if (CELL_nbytes < 1) {
- G_warning(_
- ("[%s] in mapset [%s]-format field in header file invalid"),
+ G_warning(_("[%s] in mapset [%s]-format field in header file invalid"),
r_name, r_mapset);
return -1;
}
}
if (cellhd.proj != G__.window.proj) {
- G_warning(_
- ("[%s] in mapset [%s] - in different projection than current region:\n found map [%s] in: <%s>, should be <%s> "),
+ G_warning(_("[%s] in mapset [%s] - in different projection than current region:\n found map [%s] in: <%s>, should be <%s> "),
name, mapset, name, G__projection_name(cellhd.proj),
G__projection_name(G__.window.proj));
return -1;
}
if (cellhd.zone != G__.window.zone) {
- G_warning(_
- ("[%s] in mapset [%s] - in different zone [%d] than current region [%d]"),
+ G_warning(_("[%s] in mapset [%s] - in different zone [%d] than current region [%d]"),
name, mapset, cellhd.zone, G__.window.zone);
return -1;
}
@@ -689,8 +685,7 @@
}
if (open_mode == OPEN_NEW_RANDOM) {
- G_warning(_
- ("Can't write embedded null values for map open for random access"));
+ G_warning(_("Can't write embedded null values for map open for random access"));
if (fcb->map_type == CELL_TYPE)
G_write_zeros(fd,
(long)WRITE_NBYTES * fcb->cellhd.cols *
Modified: grass/branches/develbranch_6/lib/gis/parser.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/parser.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/parser.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -774,8 +774,7 @@
j++;
}
if (!found) {
- G_warning(_
- ("BUG in descriptions, option %s in %s does not exist"),
+ G_warning(_("BUG in descriptions, option %s in %s does not exist"),
tokens[i], opt->key);
}
else {
@@ -877,8 +876,7 @@
sprintf(buff, "GRASS_VERBOSE=%d", G_verbose_max());
putenv(G_store(buff));
if (quiet == 1) {
- G_warning(_
- ("Use either --quiet or --verbose flag, not both. Assuming --verbose."));
+ G_warning(_("Use either --quiet or --verbose flag, not both. Assuming --verbose."));
}
quiet = -1;
}
@@ -892,8 +890,7 @@
sprintf(buff, "GRASS_VERBOSE=%d", G_verbose_min());
putenv(G_store(buff));
if (quiet == -1) {
- G_warning(_
- ("Use either --quiet or --verbose flag, not both. Assuming --quiet."));
+ G_warning(_("Use either --quiet or --verbose flag, not both. Assuming --quiet."));
}
quiet = 1; /* for passing to gui init */
}
Modified: grass/branches/develbranch_6/lib/gis/put_row.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/put_row.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/put_row.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -212,8 +212,7 @@
struct fileinfo *fcb = &G__.fileinfo[fd];
if (fcb->map_type != CELL_TYPE) {
- G_fatal_error(_
- ("G_put_map_row: %s is not integer! Use G_put_[f/d]_raster_row()!"),
+ G_fatal_error(_("G_put_map_row: %s is not integer! Use G_put_[f/d]_raster_row()!"),
fcb->name);
return -1;
}
@@ -257,16 +256,14 @@
if (!random)
return 1;
- G_warning(_
- ("%s: map [%s] not open for random write - request ignored"),
+ G_warning(_("%s: map [%s] not open for random write - request ignored"),
me, fcb->name);
break;
case OPEN_NEW_RANDOM:
if (random)
return 1;
- G_warning(_
- ("%s: map [%s] not open for sequential write - request ignored"),
+ G_warning(_("%s: map [%s] not open for sequential write - request ignored"),
me, fcb->name);
break;
default:
Modified: grass/branches/develbranch_6/lib/gis/reclass.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/reclass.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/reclass.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -143,8 +143,7 @@
G_warning(_("Too many reclass categories for [%s in %s]"),
name, mapset);
else
- G_warning(_
- ("Illegal reclass format in header file for [%s in %s]"),
+ G_warning(_("Illegal reclass format in header file for [%s in %s]"),
name, mapset);
stat = -1;
}
Modified: grass/branches/develbranch_6/lib/gis/set_window.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/set_window.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/set_window.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -73,8 +73,7 @@
G__.fileinfo[i].cellhd.proj == window->proj)
continue;
if (i != maskfd) {
- G_warning(_
- ("G_set_window(): projection/zone differs from that of "
+ G_warning(_("G_set_window(): projection/zone differs from that of "
"currently open raster maps"));
return -1;
}
Modified: grass/branches/develbranch_6/lib/gis/spawn.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/spawn.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/spawn.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -355,8 +355,7 @@
}
if (dup2(r->src_fd, r->dst_fd) < 0) {
- G_warning(_
- ("G_spawn: unable to duplicate descriptor %d to %d"),
+ G_warning(_("G_spawn: unable to duplicate descriptor %d to %d"),
r->src_fd, r->dst_fd);
_exit(127);
}
@@ -365,8 +364,7 @@
}
else if (r->src_fd >= 0) {
if (dup2(r->src_fd, r->dst_fd) < 0) {
- G_warning(_
- ("G_spawn: unable to duplicate descriptor %d to %d"),
+ G_warning(_("G_spawn: unable to duplicate descriptor %d to %d"),
r->src_fd, r->dst_fd);
_exit(127);
}
Modified: grass/branches/develbranch_6/lib/gis/view.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/view.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gis/view.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -543,13 +543,11 @@
{
switch (vis) {
case 0:
- G_warning(_
- (" Window saved in \"%s\" is completely outside of current GRASS window."),
+ G_warning(_(" Window saved in \"%s\" is completely outside of current GRASS window."),
viewname);
break;
default:
- G_warning(_
- (" Only %d%% of window saved in \"%s\" overlaps with current GRASS window."),
+ G_warning(_(" Only %d%% of window saved in \"%s\" overlaps with current GRASS window."),
vis, viewname);
break;
}
Modified: grass/branches/develbranch_6/lib/gmath/la.c
===================================================================
--- grass/branches/develbranch_6/lib/gmath/la.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gmath/la.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -528,8 +528,7 @@
G_matrix_free(mtx);
if (res_info > 0) {
- G_warning(_
- ("Matrix (or submatrix is singular). Solution undetermined"));
+ G_warning(_("Matrix (or submatrix is singular). Solution undetermined"));
return 1;
}
else if (res_info < 0) {
@@ -540,8 +539,7 @@
}
default:
{
- G_warning(_
- ("Procedure not yet available for selected matrix type"));
+ G_warning(_("Procedure not yet available for selected matrix type"));
return -1;
}
} /* end switch */
Modified: grass/branches/develbranch_6/lib/gpde/N_solvers.c
===================================================================
--- grass/branches/develbranch_6/lib/gpde/N_solvers.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gpde/N_solvers.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -47,8 +47,7 @@
{
if (les->type != N_NORMAL_LES) {
- G_warning(_
- ("The gauss elimination solver does not work with sparse matrices"));
+ G_warning(_("The gauss elimination solver does not work with sparse matrices"));
return 0;
}
@@ -153,8 +152,7 @@
int N_solver_cholesky(N_les * les)
{
if (les->type != N_NORMAL_LES) {
- G_warning(_
- ("The cholesky solver does not work with sparse matrices"));
+ G_warning(_("The cholesky solver does not work with sparse matrices"));
return 0;
}
Modified: grass/branches/develbranch_6/lib/gpde/N_solvers_krylov.c
===================================================================
--- grass/branches/develbranch_6/lib/gpde/N_solvers_krylov.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gpde/N_solvers_krylov.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -187,8 +187,7 @@
;
}
else {
- G_warning(_
- ("Unable to solve the linear equation system"));
+ G_warning(_("Unable to solve the linear equation system"));
error_break = 1;
}
}
@@ -355,8 +354,7 @@
;
}
else {
- G_warning(_
- ("Unable to solve the linear equation system"));
+ G_warning(_("Unable to solve the linear equation system"));
error_break = 1;
}
}
@@ -480,8 +478,7 @@
;
}
else {
- G_warning(_
- ("Unable to solve the linear equation system"));
+ G_warning(_("Unable to solve the linear equation system"));
error_break = 1;
}
Modified: grass/branches/develbranch_6/lib/gpde/test/test_gwflow.c
===================================================================
--- grass/branches/develbranch_6/lib/gpde/test/test_gwflow.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gpde/test/test_gwflow.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -51,8 +51,7 @@
if (sum > 0)
G_warning(_("\n-- gwflow integration tests failure --"));
else
- G_message(_
- ("\n-- gwflow integration tests finished successfully --"));
+ G_message(_("\n-- gwflow integration tests finished successfully --"));
return sum;
}
Modified: grass/branches/develbranch_6/lib/gpde/test/test_heat.c
===================================================================
--- grass/branches/develbranch_6/lib/gpde/test/test_heat.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gpde/test/test_heat.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -39,8 +39,7 @@
if (sum > 0)
G_warning(_("\n-- heat flow integration tests failure --"));
else
- G_message(_
- ("\n-- heat flow integration tests finished successfully --"));
+ G_message(_("\n-- heat flow integration tests finished successfully --"));
return sum;
}
Modified: grass/branches/develbranch_6/lib/gpde/test/test_solute_transport.c
===================================================================
--- grass/branches/develbranch_6/lib/gpde/test/test_solute_transport.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/gpde/test/test_solute_transport.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -51,8 +51,7 @@
if (sum > 0)
G_warning(_("\n-- solute_transport integration tests failure --"));
else
- G_message(_
- ("\n-- solute_transport integration tests finished successfully --"));
+ G_message(_("\n-- solute_transport integration tests finished successfully --"));
return sum;
}
Modified: grass/branches/develbranch_6/lib/imagery/fopen.c
===================================================================
--- grass/branches/develbranch_6/lib/imagery/fopen.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/imagery/fopen.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -76,8 +76,7 @@
fd = G_fopen_new_misc("group", element, group);
if (!fd)
- G_warning(_
- ("Unable to create file [%s] for subgroup [%s] of group [%s in %s]"),
+ G_warning(_("Unable to create file [%s] for subgroup [%s] of group [%s in %s]"),
file, subgroup, group, G_mapset());
return fd;
@@ -99,8 +98,7 @@
fd = G_fopen_append_misc("group", element, group);
if (!fd)
- G_warning(_
- ("Unable to open file [%s] for subgroup [%s] of group [%s in %s]"),
+ G_warning(_("Unable to open file [%s] for subgroup [%s] of group [%s in %s]"),
file, subgroup, group, G_mapset());
return fd;
@@ -115,8 +113,7 @@
/* find file first */
if (!I_find_subgroup_file(group, subgroup, file)) {
- G_warning(_
- ("Unable to find file [%s] for subgroup [%s] of group [%s in %s]"),
+ G_warning(_("Unable to find file [%s] for subgroup [%s] of group [%s in %s]"),
file, subgroup, group, G_mapset());
return ((FILE *) NULL);
@@ -127,8 +124,7 @@
fd = G_fopen_old_misc("group", element, group, G_mapset());
if (!fd)
- G_warning(_
- ("Unable to open file [%s] for subgroup [%s] of group [%s in %s]"),
+ G_warning(_("Unable to open file [%s] for subgroup [%s] of group [%s in %s]"),
file, subgroup, group, G_mapset());
return fd;
Modified: grass/branches/develbranch_6/lib/ogsf/GK2.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/GK2.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/ogsf/GK2.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -272,8 +272,7 @@
Views = gk_make_linear_framesfromkeys(Keys, Numkeys, Viewsteps, loop);
if (!Views) {
- G_warning(_
- ("Check no. of frames requested and keyframes marked"));
+ G_warning(_("Check no. of frames requested and keyframes marked"));
}
}
else if (Numkeys > 2) {
@@ -286,8 +285,7 @@
(Keys, Numkeys, Viewsteps, loop, 1.0 - Tension);
if (!Views) {
- G_warning(_
- ("Check no. of frames requested and keyframes marked"));
+ G_warning(_("Check no. of frames requested and keyframes marked"));
}
}
Modified: grass/branches/develbranch_6/lib/ogsf/GS2.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/GS2.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/ogsf/GS2.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -1633,8 +1633,7 @@
if (rast_head.north <= wind.south ||
rast_head.south >= wind.north ||
rast_head.east <= wind.west || rast_head.west >= wind.east) {
- G_fatal_error(_
- ("Raster map <%s> is outside of current region. Load failed."),
+ G_fatal_error(_("Raster map <%s> is outside of current region. Load failed."),
filename);
}
@@ -1715,15 +1714,13 @@
}
if (0 > gs_malloc_att_buff(gs, att, ATTY_NULL)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
switch (atty) {
case ATTY_MASK:
if (0 > gs_malloc_att_buff(gs, att, ATTY_MASK)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_bitmap(&wind, filename, tbuff->bm);
@@ -1732,8 +1729,7 @@
break;
case ATTY_CHAR:
if (0 > gs_malloc_att_buff(gs, att, ATTY_CHAR)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_char(&wind, filename, tbuff->cb,
@@ -1743,8 +1739,7 @@
break;
case ATTY_SHORT:
if (0 > gs_malloc_att_buff(gs, att, ATTY_SHORT)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_short(&wind, filename, tbuff->sb,
@@ -1754,8 +1749,7 @@
break;
case ATTY_FLOAT:
if (0 > gs_malloc_att_buff(gs, att, ATTY_FLOAT)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_float(&wind, filename, tbuff->fb,
@@ -1766,8 +1760,7 @@
case ATTY_INT:
default:
if (0 > gs_malloc_att_buff(gs, att, ATTY_INT)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
ret = Gs_loadmap_as_int(&wind, filename, tbuff->ib,
@@ -1820,8 +1813,7 @@
else if (ATTY_FLOAT == atty) {
if (!reuse) {
if (0 > gs_malloc_att_buff(gs, att, ATTY_INT)) {
- G_fatal_error(_
- ("GS_load_att_map(): Out of memory. Unable to load map"));
+ G_fatal_error(_("GS_load_att_map(): Out of memory. Unable to load map"));
}
Gs_pack_colors_float(filename, tbuff->fb, tbuff->ib,
Modified: grass/branches/develbranch_6/lib/ogsf/Gp3.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/Gp3.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/ogsf/Gp3.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -201,8 +201,7 @@
Vect_close(&map);
if (!np) {
- G_warning(_
- ("No points from vector map <%s> fall within current region"),
+ G_warning(_("No points from vector map <%s> fall within current region"),
G_fully_qualified_name(grassname, mapset));
return (NULL);
}
Modified: grass/branches/develbranch_6/lib/ogsf/Gs3.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/Gs3.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/ogsf/Gs3.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -640,8 +640,7 @@
G_get_color_range(&min, &max, &colrules);
if (min < 0 || max > 255) {
- G_warning(_
- ("Color table range doesn't match data (mincol=%d, maxcol=%d"),
+ G_warning(_("Color table range doesn't match data (mincol=%d, maxcol=%d"),
min, max);
min = min < 0 ? 0 : min;
Modified: grass/branches/develbranch_6/lib/ogsf/Gv3.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/Gv3.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/ogsf/Gv3.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -246,8 +246,7 @@
Vect_close(&map);
if (!nl) {
- G_warning(_
- ("No features from vector map <%s> fall within current region"),
+ G_warning(_("No features from vector map <%s> fall within current region"),
G_fully_qualified_name(grassname, mapset));
return (NULL);
}
Modified: grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -303,8 +303,7 @@
/* auto detect the output format from the name. default is mpeg. */
fmt = guess_format(NULL, filename, NULL);
if (!fmt) {
- G_warning(_
- ("Unable to deduce output format from file extension: using MPEG"));
+ G_warning(_("Unable to deduce output format from file extension: using MPEG"));
fmt = guess_format("mpeg", NULL, NULL);
}
if (!fmt) {
Modified: grass/branches/develbranch_6/lib/proj/convert.c
===================================================================
--- grass/branches/develbranch_6/lib/proj/convert.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/proj/convert.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -381,8 +381,7 @@
G_set_key_value("proj", pszProj, *projinfo);
}
else
- G_warning(_
- ("No projection name! Projection parameters likely to be meaningless."));
+ G_warning(_("No projection name! Projection parameters likely to be meaningless."));
/* -------------------------------------------------------------------- */
@@ -418,8 +417,7 @@
if (datum == NULL) {
if (paramspresent < 2)
/* Only give warning if no parameters present */
- G_warning(_
- ("Datum <%s> not recognised by GRASS and no parameters found"),
+ G_warning(_("Datum <%s> not recognised by GRASS and no parameters found"),
pszDatumName);
}
else {
@@ -435,13 +433,11 @@
GPJ_get_default_datum_params_by_name(datum, ¶ms);
if (paramsets < 0)
- G_warning(_
- ("Datum <%s> apparently recognised by GRASS but no parameters found. "
+ G_warning(_("Datum <%s> apparently recognised by GRASS but no parameters found. "
"You may want to look into this."), datum);
else if (datumtrans > paramsets) {
- G_warning(_
- ("Invalid tranformation number %d; valid range is 1 to %d. "
+ G_warning(_("Invalid tranformation number %d; valid range is 1 to %d. "
"Leaving datum transform parameters unspecified."),
datumtrans, paramsets);
datumtrans = 0;
Modified: grass/branches/develbranch_6/lib/proj/get_proj.c
===================================================================
--- grass/branches/develbranch_6/lib/proj/get_proj.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/proj/get_proj.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -294,8 +294,7 @@
if (nsize = strlen(s), nsize) {
if (nopt >= MAX_PARGS) {
fprintf(stderr, "nopt = %d, s=%s\n", nopt, str);
- G_fatal_error(_
- ("Option input overflowed option table"));
+ G_fatal_error(_("Option input overflowed option table"));
}
if (strncmp("zone=", s, 5) == 0) {
Modified: grass/branches/develbranch_6/lib/raster/io_sock.c
===================================================================
--- grass/branches/develbranch_6/lib/raster/io_sock.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/raster/io_sock.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -61,8 +61,7 @@
if (!name) {
if (verbose) {
G_warning(_("No graphics monitor has been selected for output."));
- G_warning(_
- ("Please run \"d.mon\" to select a graphics monitor."));
+ G_warning(_("Please run \"d.mon\" to select a graphics monitor."));
}
return (NO_MON);
}
@@ -96,8 +95,7 @@
case ECONNREFUSED:
case EADDRINUSE:
if (verbose) {
- G_warning(_
- ("Socket is already in use or not accepting connections."));
+ G_warning(_("Socket is already in use or not accepting connections."));
G_warning(_("Use d.mon to select a monitor"));
}
return (NO_RUN);
Modified: grass/branches/develbranch_6/lib/rst/interp_float/segmen2d.c
===================================================================
--- grass/branches/develbranch_6/lib/rst/interp_float/segmen2d.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/rst/interp_float/segmen2d.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -110,8 +110,7 @@
while ((npt < MINPTS) || (npt > params->KMAX2)) {
if (i >= 70) {
fprintf(stderr, "\n");
- G_warning(_
- ("taking too long to find points for interpolation--"
+ G_warning(_("taking too long to find points for interpolation--"
"please change the region to area where your points are. "
"Continuing calculations..."));
break;
Modified: grass/branches/develbranch_6/lib/rst/interp_float/vinput2d.c
===================================================================
--- grass/branches/develbranch_6/lib/rst/interp_float/vinput2d.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/rst/interp_float/vinput2d.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -89,12 +89,10 @@
zctype = db_column_Ctype(driver, Fi->table, zcol);
G_debug(3, " zcol C type = %d", zctype);
if (zctype == -1)
- G_fatal_error(_
- ("Cannot find z column <%s> (please verify name, e.g. with v.info)"),
+ G_fatal_error(_("Cannot find z column <%s> (please verify name, e.g. with v.info)"),
zcol);
if (zctype != DB_C_TYPE_INT && zctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type of z column is not supported (must be integer or double)"));
+ G_fatal_error(_("Column type of z column is not supported (must be integer or double)"));
db_CatValArray_init(&zarray);
G_debug(3, "RST SQL WHERE: %s", params->wheresql);
@@ -107,11 +105,9 @@
if (sctype == -1)
G_fatal_error(_("Cannot read column type of smooth column"));
if (sctype == DB_C_TYPE_DATETIME)
- G_fatal_error(_
- ("Column type of smooth column (datetime) is not supported"));
+ G_fatal_error(_("Column type of smooth column (datetime) is not supported"));
if (sctype != DB_C_TYPE_INT && sctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type of s column is not supported (must be integer or double)"));
+ G_fatal_error(_("Column type of s column is not supported (must be integer or double)"));
db_CatValArray_init(&sarray);
db_select_CatValArray(driver, Fi->table, Fi->key, scol,
@@ -332,16 +328,14 @@
fprintf(stderr, "\n");
if (OUTRANGE > 0)
- G_warning(_
- ("there are points outside specified 2D/3D region--ignored %d points"),
+ G_warning(_("there are points outside specified 2D/3D region--ignored %d points"),
OUTRANGE);
if (npoint > 0)
G_warning(_("ignoring %d points -- too dense"), npoint);
npoint = k - npoint - OUTRANGE;
if (npoint < params->kmin) {
if (npoint != 0) {
- G_warning(_
- ("%d points given for interpolation (after thinning) is less than given NPMIN=%d"),
+ G_warning(_("%d points given for interpolation (after thinning) is less than given NPMIN=%d"),
npoint, params->kmin);
params->kmin = npoint;
}
Modified: grass/branches/develbranch_6/lib/symbol/read.c
===================================================================
--- grass/branches/develbranch_6/lib/symbol/read.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/symbol/read.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -251,8 +251,7 @@
strcpy(group, sname);
c = strchr(group, '/');
if (c == NULL) {
- G_warning(_
- ("Incorrect symbol name: '%s' (should be: group/name or group/name at mapset)"),
+ G_warning(_("Incorrect symbol name: '%s' (should be: group/name or group/name at mapset)"),
sname);
return NULL;
}
@@ -376,8 +375,7 @@
}
else if (sscanf(data, "%d %d %d", &r, &g, &b) == 3) {
if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
- G_warning(_
- ("Incorrect symbol color: '%s', using default."),
+ G_warning(_("Incorrect symbol color: '%s', using default."),
buf);
else {
fr = r / 255.0;
@@ -405,8 +403,7 @@
}
else if (sscanf(data, "%d %d %d", &r, &g, &b) == 3) {
if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
- G_warning(_
- ("Incorrect symbol color: '%s', using default."),
+ G_warning(_("Incorrect symbol color: '%s', using default."),
buf);
else {
fr = r / 255.0;
Modified: grass/branches/develbranch_6/lib/vector/Vlib/array.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/array.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/array.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -289,8 +289,7 @@
db_close_database_shutdown_driver(driver);
if (ncats == -1) {
- G_warning(_
- ("Unable to select record from table <%s> (key %s, where %s)"),
+ G_warning(_("Unable to select record from table <%s> (key %s, where %s)"),
Fi->table, Fi->key, where);
return -1;
}
Modified: grass/branches/develbranch_6/lib/vector/Vlib/build_ogr.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/build_ogr.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/build_ogr.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -345,8 +345,7 @@
/* test layer capabilities */
if (!OGR_L_TestCapability(Map->fInfo.ogr.layer, OLCRandomRead)) {
- G_warning(_
- ("Random read is not supported by OGR for this layer, cannot build support"));
+ G_warning(_("Random read is not supported by OGR for this layer, cannot build support"));
return 0;
}
Modified: grass/branches/develbranch_6/lib/vector/Vlib/cats.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/cats.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/cats.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -126,8 +126,7 @@
/* field was not found so we shall append new cat */
/* test if space exist */
if (n >= GV_NCATS_MAX) {
- G_fatal_error(_
- ("Too many categories (%d), unable to set cat %d (layer %d)"),
+ G_fatal_error(_("Too many categories (%d), unable to set cat %d (layer %d)"),
Cats->n_cats, cat, field);
}
@@ -374,8 +373,7 @@
max = min;
else { /* error */
- G_warning(_
- ("Unable to convert category string '%s' (from '%s') to category range"),
+ G_warning(_("Unable to convert category string '%s' (from '%s') to category range"),
buf, str);
err++;
continue;
Modified: grass/branches/develbranch_6/lib/vector/Vlib/cindex.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/cindex.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/cindex.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -104,8 +104,7 @@
check_status(Map);
if (index < 0 || index >= Map->plus.n_cidx)
- G_fatal_error(_
- ("Invalid layer index (index < 0 or index >= number of layers)"));
+ G_fatal_error(_("Invalid layer index (index < 0 or index >= number of layers)"));
return (Map->plus.cidx[index].n_ucats);
}
@@ -509,8 +508,7 @@
fp.file = G_fopen_old(buf, GV_CIDX_ELEMENT, Map->mapset);
if (fp.file == NULL) { /* category index file is not available */
- G_warning(_
- ("Unable to open category index file for vector map <%s@%s>"),
+ G_warning(_("Unable to open category index file for vector map <%s@%s>"),
Map->name, Map->mapset);
return -1;
}
Modified: grass/branches/develbranch_6/lib/vector/Vlib/field.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/field.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/field.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -91,8 +91,7 @@
}
if (Map->mode != GV_MODE_WRITE && Map->mode != GV_MODE_RW) {
- G_warning(_
- ("Unable to add database link, map is not opened in WRITE mode"));
+ G_warning(_("Unable to add database link, map is not opened in WRITE mode"));
return -1;
}
@@ -544,8 +543,7 @@
if (db_open_select_cursor
(driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) {
/* neither FID nor ogc_fid nor ogr_fid nor gid available */
- G_warning(_
- ("All FID tests failed. Neither 'FID' nor 'ogc_fid' "
+ G_warning(_("All FID tests failed. Neither 'FID' nor 'ogc_fid' "
"nor 'ogr_fid' nor 'gid' available in OGR DB table"));
db_close_database_shutdown_driver(driver);
return 0;
@@ -773,8 +771,7 @@
void Vect_set_db_updated(struct Map_info *Map)
{
if (strcmp(Map->mapset, G_mapset()) != 0) {
- G_fatal_error(_
- ("Bug: attempt to update map which is not in current mapset"));
+ G_fatal_error(_("Bug: attempt to update map which is not in current mapset"));
}
Vect_write_dblinks(Map);
Modified: grass/branches/develbranch_6/lib/vector/Vlib/intersect.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/intersect.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/intersect.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -319,8 +319,7 @@
}
/* should not be reached */
- G_warning(_
- ("Vect_segment_intersection() ERROR (collinear vertical segments)"));
+ G_warning(_("Vect_segment_intersection() ERROR (collinear vertical segments)"));
G_warning("%.15g %.15g", ax1, ay1);
G_warning("%.15g %.15g", ax2, ay2);
G_warning("x");
@@ -446,8 +445,7 @@
}
/* should not be reached */
- G_warning(_
- ("Vect_segment_intersection() ERROR (collinear non vertical segments)"));
+ G_warning(_("Vect_segment_intersection() ERROR (collinear non vertical segments)"));
G_warning("%.15g %.15g", ax1, ay1);
G_warning("%.15g %.15g", ax2, ay2);
G_warning("x");
Modified: grass/branches/develbranch_6/lib/vector/Vlib/legal_vname.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/legal_vname.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/legal_vname.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -45,16 +45,14 @@
sprintf(buf, "%s", s);
if (*s == '.' || *s == 0) {
- G_warning(_
- ("Illegal vector map name <%s>. May not contain '.' or 'NULL'."),
+ G_warning(_("Illegal vector map name <%s>. May not contain '.' or 'NULL'."),
buf);
return -1;
}
/* file name must start with letter */
if (!((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z'))) {
- G_warning(_
- ("Illegal vector map name <%s>. Must start with a letter."),
+ G_warning(_("Illegal vector map name <%s>. Must start with a letter."),
buf);
return -1;
}
@@ -62,16 +60,14 @@
for (s++; *s; s++)
if (!((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z') ||
(*s >= '0' && *s <= '9') || *s == '_' || *s == '@')) {
- G_warning(_
- ("Illegal vector map name <%s>. Character '%c' not allowed."),
+ G_warning(_("Illegal vector map name <%s>. Character '%c' not allowed."),
buf, *s);
return -1;
}
for (i = 0; keywords[i]; i++)
if (G_strcasecmp(buf, keywords[i]) == 0) {
- G_warning(_
- ("Illegal vector map name <%s>. SQL keyword cannot be used as vector map name."),
+ G_warning(_("Illegal vector map name <%s>. SQL keyword cannot be used as vector map name."),
buf);
return -1;
}
@@ -102,8 +98,7 @@
if (Vect_legal_filename(output) == -1) {
if (error == GV_FATAL_EXIT) {
- G_fatal_error(_
- ("Output vector map name <%s> is not valid map name"),
+ G_fatal_error(_("Output vector map name <%s> is not valid map name"),
output);
}
else if (error == GV_FATAL_PRINT) {
Modified: grass/branches/develbranch_6/lib/vector/Vlib/map.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/map.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/map.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -263,8 +263,7 @@
}
else {
if (db_create_index2(driver, Fin->table, Fi->key) != DB_OK)
- G_warning(_
- ("Unable to create index for table <%s>, key <%s>"),
+ G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fi->table, Fi->key);
db_close_database_shutdown_driver(driver);
@@ -399,8 +398,7 @@
}
else {
if (db_create_index2(driver, Fout->table, Fin->key) != DB_OK)
- G_warning(_
- ("Unable to create index for table <%s>, key <%s>"),
+ G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fout->table, Fout->key);
db_close_database_shutdown_driver(driver);
@@ -460,8 +458,7 @@
for (i = 0; i < n; i++) {
Fi = Vect_get_dblink(&Map, i);
if (Fi == NULL) {
- G_warning(_
- ("Database connection not defined for layer %d"),
+ G_warning(_("Database connection not defined for layer %d"),
Map.dblnk->field[i].number);
Vect_close(&Map);
return -1;
@@ -471,8 +468,7 @@
ret = db_table_exists(Fi->driver, Fi->database, Fi->table);
if (ret == -1) {
- G_warning(_
- ("Unable to find table <%s> linked to vector map <%s>"),
+ G_warning(_("Unable to find table <%s> linked to vector map <%s>"),
Fi->table, map);
Vect_close(&Map);
return -1;
@@ -488,8 +484,7 @@
}
}
else {
- G_warning(_
- ("Table <%s> linked to vector map <%s> does not exist"),
+ G_warning(_("Table <%s> linked to vector map <%s> does not exist"),
Fi->table, map);
}
}
@@ -615,8 +610,7 @@
}
else {
if (db_create_index2(driver, Fin->table, Fi->key) != DB_OK)
- G_warning(_
- ("Unable to create index for table <%s>, key <%s>"),
+ G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fin->table, Fin->key);
db_close_database_shutdown_driver(driver);
Modified: grass/branches/develbranch_6/lib/vector/Vlib/net.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/net.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/net.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -193,8 +193,7 @@
fctype = db_sqltype_to_Ctype(db_get_column_sqltype(Column));
if (fctype != DB_C_TYPE_INT && fctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Data type of column <%s> not supported (must be numeric)"),
+ G_fatal_error(_("Data type of column <%s> not supported (must be numeric)"),
afcol);
db_CatValArray_init(&fvarr);
@@ -211,8 +210,7 @@
bctype = db_sqltype_to_Ctype(db_get_column_sqltype(Column));
if (bctype != DB_C_TYPE_INT && bctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Data type of column <%s> not supported (must be numeric)"),
+ G_fatal_error(_("Data type of column <%s> not supported (must be numeric)"),
abcol);
db_CatValArray_init(&bvarr);
@@ -365,8 +363,7 @@
fctype = db_sqltype_to_Ctype(db_get_column_sqltype(Column));
if (fctype != DB_C_TYPE_INT && fctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Data type of column <%s> not supported (must be numeric)"),
+ G_fatal_error(_("Data type of column <%s> not supported (must be numeric)"),
ncol);
db_CatValArray_init(&fvarr);
@@ -402,8 +399,7 @@
&dcost);
}
if (ret != DB_OK) {
- G_warning(_
- ("Database record for node %d (cat = %d) not found "
+ G_warning(_("Database record for node %d (cat = %d) not found "
"(cost set to 0)"), i, cat);
}
cfound = 1;
Modified: grass/branches/develbranch_6/lib/vector/Vlib/open.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/open.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/open.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -176,8 +176,7 @@
Map->gisdbase = G_store(G_gisdbase());
if (update && (0 != strcmp(Map->mapset, G_mapset()))) {
- G_warning(_
- ("Vector map which is not in the current mapset cannot be opened for update"));
+ G_warning(_("Vector map which is not in the current mapset cannot be opened for update"));
return -1;
}
@@ -233,8 +232,7 @@
level = 1;
}
else if (ret == -1) {
- G_fatal_error(_
- ("Unable to open topology file for vector map <%s>"),
+ G_fatal_error(_("Unable to open topology file for vector map <%s>"),
Vect_get_full_name(Map));
}
/* open spatial index, not needed for head_only */
@@ -260,8 +258,7 @@
level = 1;
}
else if (ret == -1) { /* file exists, but cannot be opened */
- G_fatal_error(_
- ("Unable to open category index file for vector map <%s>"),
+ G_fatal_error(_("Unable to open category index file for vector map <%s>"),
Vect_get_full_name(Map));
}
}
@@ -728,8 +725,7 @@
/* do checks */
err = 0;
if (CInfo.size != Plus->coor_size) {
- G_warning(_
- ("Size of 'coor' file differs from value saved in topology file"));
+ G_warning(_("Size of 'coor' file differs from value saved in topology file"));
err = 1;
}
/* Do not check mtime because mtime is changed by copy */
Modified: grass/branches/develbranch_6/lib/vector/Vlib/open_nat.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/open_nat.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/open_nat.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -142,13 +142,11 @@
Map->head.size, CInfo.size);
if (dif > 0) {
- G_warning(_
- ("Coor files of vector map <%s@%s> is larger than it should be "
+ G_warning(_("Coor files of vector map <%s@%s> is larger than it should be "
"(%ld bytes excess)"), Map->name, Map->mapset, dif);
}
else if (dif < 0) {
- G_warning(_
- ("Coor files of vector <%s@%s> is shorter than it should be "
+ G_warning(_("Coor files of vector <%s@%s> is shorter than it should be "
"(%ld bytes missing)."), Map->name, Map->mapset, -dif);
}
return 1;
Modified: grass/branches/develbranch_6/lib/vector/Vlib/open_ogr.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/open_ogr.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/open_ogr.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -144,14 +144,12 @@
/* check version numbers */
if (Version_Major > 5 || Version_Minor > 0) {
if (Back_Major > 5 || Back_Minor > 0) {
- G_fatal_error(_
- ("Feature index format version %d.%d is not supported by this release."
+ G_fatal_error(_("Feature index format version %d.%d is not supported by this release."
" Try to rebuild topology or upgrade GRASS."),
Version_Major, Version_Minor);
return (-1);
}
- G_warning(_
- ("Your GRASS version does not fully support feature index format %d.%d of the vector."
+ G_warning(_("Your GRASS version does not fully support feature index format %d.%d of the vector."
" Consider to rebuild topology or upgrade GRASS."),
Version_Major, Version_Minor);
}
Modified: grass/branches/develbranch_6/lib/vector/Vlib/overlay.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/overlay.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/overlay.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -120,12 +120,10 @@
/* TODO: support all types; at present only point x point, area x point and point x area supported */
if ((atype & GV_LINES) || (btype & GV_LINES))
- G_warning(_
- ("Overlay: line/boundary types not supported by AND operator"));
+ G_warning(_("Overlay: line/boundary types not supported by AND operator"));
if ((atype & GV_AREA) && (btype & GV_AREA))
- G_warning(_
- ("Overlay: area x area types not supported by AND operator"));
+ G_warning(_("Overlay: area x area types not supported by AND operator"));
/* TODO: more points in one node in one map */
Modified: grass/branches/develbranch_6/lib/vector/Vlib/read.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/read.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/read.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -103,8 +103,7 @@
G_fatal_error("Vect_read_line(): %s", _("vector map is not opened"));
if (line < 1 || line > Map->plus.n_lines)
- G_fatal_error(_
- ("Vect_read_line(): line %d is not reasonable (max line in vector map: %d)"),
+ G_fatal_error(_("Vect_read_line(): line %d is not reasonable (max line in vector map: %d)"),
line, Map->plus.n_lines);
return (*V2_read_line_array[Map->format]) (Map, line_p, line_c, line);
Modified: grass/branches/develbranch_6/lib/vector/Vlib/read_ogr.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/read_ogr.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/read_ogr.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -375,8 +375,7 @@
Map->fInfo.ogr.feature_cache =
OGR_L_GetFeature(Map->fInfo.ogr.layer, FID);
if (Map->fInfo.ogr.feature_cache == NULL) {
- G_fatal_error(_
- ("Unable to get feature geometry, FID %ld"),
+ G_fatal_error(_("Unable to get feature geometry, FID %ld"),
FID);
}
Map->fInfo.ogr.feature_cache_id = FID;
Modified: grass/branches/develbranch_6/lib/vector/Vlib/sindex.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/sindex.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/sindex.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -166,8 +166,7 @@
Node = plus->Node[i];
if (!Node)
- G_fatal_error(_
- ("BUG (Vect_build_sidx_from_topo): node does not exist"));
+ G_fatal_error(_("BUG (Vect_build_sidx_from_topo): node does not exist"));
dig_spidx_add_node(plus, i, Node->x, Node->y, Node->z);
}
@@ -179,8 +178,7 @@
Line = plus->Line[i];
if (!Line)
- G_fatal_error(_
- ("BUG (Vect_build_sidx_from_topo): line does not exist"));
+ G_fatal_error(_("BUG (Vect_build_sidx_from_topo): line does not exist"));
box.N = Line->N;
box.S = Line->S;
@@ -199,8 +197,7 @@
Area = plus->Area[i];
if (!Area)
- G_fatal_error(_
- ("BUG (Vect_build_sidx_from_topo): area does not exist"));
+ G_fatal_error(_("BUG (Vect_build_sidx_from_topo): area does not exist"));
box.N = Area->N;
box.S = Area->S;
@@ -219,8 +216,7 @@
Isle = plus->Isle[i];
if (!Isle)
- G_fatal_error(_
- ("BUG (Vect_build_sidx_from_topo): isle does not exist"));
+ G_fatal_error(_("BUG (Vect_build_sidx_from_topo): isle does not exist"));
box.N = Isle->N;
box.S = Isle->S;
Modified: grass/branches/develbranch_6/lib/vector/Vlib/write_nat.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/write_nat.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/Vlib/write_nat.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -36,8 +36,7 @@
Area = Map->plus.Area[area];
if (!Area)
- G_fatal_error(_
- ("BUG (delete_area_cats_from_cidx): Area %d does not exist"),
+ G_fatal_error(_("BUG (delete_area_cats_from_cidx): Area %d does not exist"),
area);
if (Area->centroid == 0)
@@ -64,8 +63,7 @@
Area = Map->plus.Area[area];
if (!Area)
- G_fatal_error(_
- ("BUG (add_area_cats_to_cidx): Area %d does not exist"),
+ G_fatal_error(_("BUG (add_area_cats_to_cidx): Area %d does not exist"),
area);
if (Area->centroid == 0)
Modified: grass/branches/develbranch_6/lib/vector/diglib/plus_area.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/diglib/plus_area.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/diglib/plus_area.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -301,8 +301,7 @@
Area->n_isles--;
}
else {
- G_fatal_error(_
- ("Attempt to delete not registered isle %d from area %d"),
+ G_fatal_error(_("Attempt to delete not registered isle %d from area %d"),
isle, area);
}
@@ -380,8 +379,7 @@
if (line > 0) {
Line = plus->Line[line];
if (!Line) {
- G_warning(_
- ("Dead centroid %d registered for area (bug in the vector library)"),
+ G_warning(_("Dead centroid %d registered for area (bug in the vector library)"),
line);
}
else {
@@ -405,8 +403,7 @@
for (i = 0; i < Area->n_isles; i++) {
Isle = plus->Isle[Area->isles[i]];
if (Isle == NULL) {
- G_fatal_error(_
- ("Attempt to delete area %d info from dead isle %d"),
+ G_fatal_error(_("Attempt to delete area %d info from dead isle %d"),
area, Area->isles[i]);
}
else {
@@ -749,8 +746,7 @@
G_debug(3, " area outside isle = %d", Isle->area);
if (Isle->area > 0) {
if (plus->Area[Isle->area] == NULL) {
- G_fatal_error(_
- ("Attempt to delete isle %d info from dead area %d"),
+ G_fatal_error(_("Attempt to delete isle %d info from dead area %d"),
isle, Isle->area);
}
else {
Modified: grass/branches/develbranch_6/lib/vector/diglib/plus_node.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/diglib/plus_node.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/diglib/plus_node.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -214,8 +214,7 @@
return (node->angles[i]);
}
- G_fatal_error(_
- ("Attempt to read line angle for the line which is not connected to the node: "
+ G_fatal_error(_("Attempt to read line angle for the line which is not connected to the node: "
"node %d, line %d"), nodeid, lineid);
return 0.0; /* not reached */
Modified: grass/branches/develbranch_6/lib/vector/vedit/cats.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/vedit/cats.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/lib/vector/vedit/cats.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -71,8 +71,7 @@
}
else { /* delete old category */
if (Vect_field_cat_del(Cats, layer, cat) == 0) {
- G_warning(_
- ("Unable to delete layer/category %d/%d line %d"),
+ G_warning(_("Unable to delete layer/category %d/%d line %d"),
layer, cat, line);
}
else {
Modified: grass/branches/develbranch_6/ps/ps.map/do_geogrid.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/do_geogrid.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/ps/ps.map/do_geogrid.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -269,8 +269,7 @@
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);
Modified: grass/branches/develbranch_6/ps/ps.map/do_labels.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/do_labels.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/ps/ps.map/do_labels.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -158,8 +158,7 @@
/* 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;
Modified: grass/branches/develbranch_6/ps/ps.map/main.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/ps/ps.map/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -283,8 +283,7 @@
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;
Modified: grass/branches/develbranch_6/ps/ps.map/ps_fclrtbl.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/ps_fclrtbl.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/ps/ps.map/ps_fclrtbl.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -55,8 +55,7 @@
}
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;
}
Modified: grass/branches/develbranch_6/ps/ps.map/ps_vareas.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/ps_vareas.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/ps/ps.map/ps_vareas.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -103,8 +103,7 @@
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;
}
Modified: grass/branches/develbranch_6/ps/ps.map/ps_vlines.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/ps_vlines.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/ps/ps.map/ps_vlines.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -121,8 +121,7 @@
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;
}
Modified: grass/branches/develbranch_6/ps/ps.map/ps_vpoints.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/ps_vpoints.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/ps/ps.map/ps_vpoints.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -178,8 +178,7 @@
}
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 @@
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;
}
Modified: grass/branches/develbranch_6/ps/ps.map/r_vpoints.c
===================================================================
--- grass/branches/develbranch_6/ps/ps.map/r_vpoints.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/ps/ps.map/r_vpoints.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -241,8 +241,7 @@
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");
}
Modified: grass/branches/develbranch_6/raster/r.bilinear/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.bilinear/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.bilinear/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -66,8 +66,7 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- G_warning(_
- ("This module is deprecated. Please use 'r.resamp.interp' instead."));
+ G_warning(_("This module is deprecated. Please use 'r.resamp.interp' instead."));
o_east = o_north = 0.0;
Modified: grass/branches/develbranch_6/raster/r.carve/lobf.c
===================================================================
--- grass/branches/develbranch_6/raster/r.carve/lobf.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.carve/lobf.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -71,8 +71,7 @@
/* check for divide by zero */
if (0 ==
(denom = DET2_2(pg->sum_x_sq, pg->sum_x, pg->sum_x, pg->npts))) {
- G_warning(_
- ("trying to divide by zero...no unique solution for "
+ G_warning(_("trying to divide by zero...no unique solution for "
"system...skipping..."));
pg->slope = pg->yinter = 0.0;
}
Modified: grass/branches/develbranch_6/raster/r.cats/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.cats/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.cats/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -153,8 +153,7 @@
G_init_raster_cats("", &cats);
if (0 > G_read_cats(parm.raster->answer, cmapset, &cats))
- G_fatal_error(_
- ("Unable to read category file of raster map <%s@%s>"),
+ G_fatal_error(_("Unable to read category file of raster map <%s@%s>"),
parm.raster->answer, cmapset);
if (G_write_cats(name, &cats) >= 0)
@@ -212,8 +211,7 @@
G_init_raster_cats("", &cats);
if (0 > G_read_cats(name, G_mapset(), &cats))
- G_warning(_
- ("Unable to read category file of raster map <%s@%s>"),
+ G_warning(_("Unable to read category file of raster map <%s@%s>"),
name, G_mapset());
if (parm.fmt_str->answer) {
@@ -252,8 +250,7 @@
}
else {
if (G_read_cats(name, mapset, &cats) < 0)
- G_fatal_error(_
- ("Unable to read category file of raster map <%s> in <%s>"),
+ G_fatal_error(_("Unable to read category file of raster map <%s> in <%s>"),
name, mapset);
}
@@ -269,8 +266,7 @@
}
else {
if (map_type != CELL_TYPE)
- G_warning(_
- ("The map is floating point! Ignoring cats list, using vals list"));
+ G_warning(_("The map is floating point! Ignoring cats list, using vals list"));
else { /* integer map */
for (i = 0; parm.cats->answers[i]; i++)
Modified: grass/branches/develbranch_6/raster/r.clump/clump.c
===================================================================
--- grass/branches/develbranch_6/raster/r.clump/clump.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.clump/clump.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -235,8 +235,7 @@
G_set_null_value(&out_cell[column], 1, CELL_TYPE);
}
if (G_put_raster_row(out_fd, out_cell, CELL_TYPE) < 0)
- G_fatal_error(_
- ("Unable to properly write output raster map"));
+ G_fatal_error(_("Unable to properly write output raster map"));
}
/* switch the buffers so that the current buffer becomes the previous */
Modified: grass/branches/develbranch_6/raster/r.colors/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.colors/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.colors/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -254,16 +254,13 @@
G_fatal_error(_("No map specified"));
if (!cmap && !style && !rules && !interactive && !remove)
- G_fatal_error(_
- ("One of \"-i\" or \"-r\" or options \"color\", \"rast\" or \"rules\" must be specified!"));
+ G_fatal_error(_("One of \"-i\" or \"-r\" or options \"color\", \"rast\" or \"rules\" must be specified!"));
if (interactive && (style || rules || cmap))
- G_fatal_error(_
- ("Interactive mode is incompatible with \"color\", \"rules\", and \"raster\" options"));
+ G_fatal_error(_("Interactive mode is incompatible with \"color\", \"rules\", and \"raster\" options"));
if ((style && (cmap || rules)) || (cmap && rules))
- G_fatal_error(_
- ("\"color\", \"rules\", and \"raster\" options are mutually exclusive"));
+ G_fatal_error(_("\"color\", \"rules\", and \"raster\" options are mutually exclusive"));
mapset = G_find_cell2(name, "");
@@ -304,22 +301,19 @@
*/
if (strcmp(style, "random") == 0) {
if (fp)
- G_fatal_error(_
- ("Can't make random color table for floating point map"));
+ G_fatal_error(_("Can't make random color table for floating point map"));
G_make_random_colors(&colors, (CELL) min, (CELL) max);
}
else if (strcmp(style, "grey.eq") == 0) {
if (fp)
- G_fatal_error(_
- ("Can't make grey.eq color table for floating point map"));
+ G_fatal_error(_("Can't make grey.eq color table for floating point map"));
if (!have_stats)
have_stats = get_stats(name, mapset, &statf);
G_make_histogram_eq_colors(&colors, &statf);
}
else if (strcmp(style, "grey.log") == 0) {
if (fp)
- G_fatal_error(_
- ("Can't make logarithmic color table for floating point map"));
+ G_fatal_error(_("Can't make logarithmic color table for floating point map"));
if (!have_stats)
have_stats = get_stats(name, mapset, &statf);
G_make_histogram_log_colors(&colors, &statf, (CELL) min,
Modified: grass/branches/develbranch_6/raster/r.colors/rules.c
===================================================================
--- grass/branches/develbranch_6/raster/r.colors/rules.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.colors/rules.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -64,8 +64,7 @@
G_debug(3, "rulemin=%.1f rulemax=%.1f", rulemin, rulemax);
if (rulemin > min || rulemax < max)
- G_warning(_
- ("Your color rules do not cover the whole range of data!\n (rules %f to %f but data %f to %f)"),
+ G_warning(_("Your color rules do not cover the whole range of data!\n (rules %f to %f but data %f to %f)"),
rulemin, rulemax, min, max);
return 1;
Modified: grass/branches/develbranch_6/raster/r.contour/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.contour/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.contour/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -144,14 +144,12 @@
/* please, remove before GRASS 7 released */
if (q_flag->answer || n_flag->answer) {
G_putenv("GRASS_VERBOSE", "0");
- G_warning(_
- ("The '-q' and '-n' flag is superseded and will be removed "
+ G_warning(_("The '-q' and '-n' flag is superseded and will be removed "
"in future. Please use '--quiet' instead."));
}
if (!levels->answers && !step->answer) {
- G_fatal_error(_
- ("Neither \"levels\" nor \"step\" parameter specified."));
+ G_fatal_error(_("Neither \"levels\" nor \"step\" parameter specified."));
}
name = map->answer;
Modified: grass/branches/develbranch_6/raster/r.cost/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.cost/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.cost/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -269,8 +269,7 @@
count++;
if (count != 1)
- G_fatal_error(_
- ("Must specify exactly one of start_points, start_rast or coordinate"));
+ G_fatal_error(_("Must specify exactly one of start_points, start_rast or coordinate"));
}
if (opt3->answers)
@@ -304,8 +303,7 @@
if (!G_is_d_null_value(&null_cost)) {
if (null_cost < 0.0) {
- G_warning(_
- ("Warning: assigning negative cost to null cell. Null cells excluded."));
+ G_warning(_("Warning: assigning negative cost to null cell. Null cells excluded."));
G_set_d_null_value(&null_cost, 1);
}
}
@@ -465,8 +463,7 @@
fbuff = (double *)G_malloc(ncols * sizeof(double));
if (fbuff == NULL)
- G_fatal_error(_
- ("Unable to allocate memory for segment fbuff == NULL"));
+ G_fatal_error(_("Unable to allocate memory for segment fbuff == NULL"));
G_set_d_null_value(fbuff, ncols);
@@ -593,8 +590,7 @@
fd = G_open_cell_old(opt9->answer, search_mapset);
if (fd < 0)
- G_fatal_error(_
- ("can't open raster map [%s] needed for input coordinates"),
+ G_fatal_error(_("can't open raster map [%s] needed for input coordinates"),
opt9->answer);
data_type2 = G_get_raster_map_type(fd);
@@ -654,8 +650,7 @@
value = &zero;
if (top_start_pt->row < 0 || top_start_pt->row >= nrows
|| top_start_pt->col < 0 || top_start_pt->col >= ncols)
- G_fatal_error(_
- ("Specified starting location outside database window"));
+ G_fatal_error(_("Specified starting location outside database window"));
new_cell = insert(zero, top_start_pt->row, top_start_pt->col);
segment_put(&out_seg, value, top_start_pt->row,
top_start_pt->col);
Modified: grass/branches/develbranch_6/raster/r.drain/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.drain/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.drain/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -189,8 +189,7 @@
if (start_row < 0 || start_row > nrows ||
start_col < 0 || start_col > ncols) {
- G_warning(_
- ("Starting point %d is outside the current region"),
+ G_warning(_("Starting point %d is outside the current region"),
i + 1);
continue;
}
@@ -245,8 +244,7 @@
/* only catches maps out of range until something is found, not after */
if (!have_points) {
- G_warning(_
- ("Starting vector map <%s> contains no points in the current region"),
+ G_warning(_("Starting vector map <%s> contains no points in the current region"),
vpointopt->answers[i]);
}
}
Modified: grass/branches/develbranch_6/raster/r.flow/calc.c
===================================================================
--- grass/branches/develbranch_6/raster/r.flow/calc.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.flow/calc.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -530,8 +530,7 @@
parm.mem = fmem->answer;
if (!pflout->answer && !plgout->answer && !pdsout->answer)
- G_fatal_error(_
- ("You must select one or more output maps (flout, lgout, dsout)"));
+ G_fatal_error(_("You must select one or more output maps (flout, lgout, dsout)"));
if (parm.seg)
parm.mem = '\0';
Modified: grass/branches/develbranch_6/raster/r.flow/io.c
===================================================================
--- grass/branches/develbranch_6/raster/r.flow/io.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.flow/io.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -79,8 +79,7 @@
fd = open_existing_cell_file(parm.elevin, &hd);
if (!((region.ew_res == hd.ew_res)
&& (region.ns_res == hd.ns_res)))
- G_fatal_error(_
- ("Elevation file's resolution differs from current region resolution"));
+ G_fatal_error(_("Elevation file's resolution differs from current region resolution"));
for (row = 0; row < region.rows; row++) {
G_get_d_raster_row(fd, el.buf[row], row);
Modified: grass/branches/develbranch_6/raster/r.gwflow/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.gwflow/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.gwflow/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -269,14 +269,11 @@
solver = param.solver->answer;
if (strcmp(solver, N_SOLVER_DIRECT_LU) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct LU solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct LU solver do not work with sparse matrices"));
if (strcmp(solver, N_SOLVER_DIRECT_GAUSS) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct Gauss solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct Gauss solver do not work with sparse matrices"));
if (strcmp(solver, N_SOLVER_DIRECT_CHOLESKY) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct cholesky solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct cholesky solver do not work with sparse matrices"));
/*get the current region */
@@ -391,8 +388,7 @@
inner_count = 0;
do {
- G_message(_
- ("Calculation of unconfined groundwater flow loop %i\n"),
+ G_message(_("Calculation of unconfined groundwater flow loop %i\n"),
inner_count + 1);
/* we will allocate a new les for each loop */
@@ -415,8 +411,7 @@
tmp_vect[i] = les->x[i];
}
- G_message(_
- ("Maximum difference between this and last increment: %g"),
+ G_message(_("Maximum difference between this and last increment: %g"),
max_norm);
/* copy the result into the phead array */
@@ -564,8 +559,7 @@
N_solver_gauss(les);
if (les == NULL)
- G_fatal_error(_
- ("Unable to create and solve the linear equation system"));
+ G_fatal_error(_("Unable to create and solve the linear equation system"));
return les;
}
Modified: grass/branches/develbranch_6/raster/r.in.ascii/gethead.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.ascii/gethead.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.in.ascii/gethead.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -37,8 +37,7 @@
/* read the row and column dimensions */
if (fscanf(fd, "%d %d \n", &nc, &nr) != 2) {
- G_warning(_
- ("error reading the column and row dimension from the Surfer grid file"));
+ G_warning(_("error reading the column and row dimension from the Surfer grid file"));
return 0;
}
@@ -167,8 +166,7 @@
}
}
else
- G_warning(_
- ("ignoring type filed in header, type is set on command line"));
+ G_warning(_("ignoring type filed in header, type is set on command line"));
continue;
}
@@ -180,8 +178,7 @@
}
}
else
- G_warning(_
- ("ignoring multiplier filed in header, multiplier is set on command line"));
+ G_warning(_("ignoring multiplier filed in header, multiplier is set on command line"));
continue;
}
@@ -189,8 +186,7 @@
if (!(*nval)) /* if null val string not set on command line */
*nval = G_store(value);
else
- G_warning(_
- ("ignoring null filed in header, null string is set on command line"));
+ G_warning(_("ignoring null filed in header, null string is set on command line"));
continue;
}
Modified: grass/branches/develbranch_6/raster/r.in.bin/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.bin/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.in.bin/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -290,8 +290,7 @@
if (no_coord == 0 && no_dim == 0) { /* Get all parmameters */
if (!parm.north->answer || !parm.south->answer ||
!parm.west->answer || !parm.east->answer)
- G_fatal_error(_
- ("You have to provide all limits of geographic region (n,s,e,w)"));
+ G_fatal_error(_("You have to provide all limits of geographic region (n,s,e,w)"));
if (!G_scan_northing
(parm.north->answer, &cellhd.north, cellhd.proj))
return 1;
Modified: grass/branches/develbranch_6/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.gdal/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.in.gdal/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -159,8 +159,7 @@
/* -------------------------------------------------------------------- */
if (parm.target->answer && parm.outloc->answer
&& strcmp(parm.target->answer, parm.outloc->answer) == 0) {
- G_fatal_error(_
- ("You have to specify a target location different from output location"));
+ G_fatal_error(_("You have to specify a target location different from output location"));
}
@@ -211,8 +210,7 @@
if (!parm.outloc->answer) { /* Check if the map exists */
if (G_find_cell2(output, G_mapset())) {
if (overwrite)
- G_warning(_
- ("Raster map <%s> already exists and will be overwritten"),
+ G_warning(_("Raster map <%s> already exists and will be overwritten"),
output);
else
G_fatal_error(_("Raster map <%s> already exists"), output);
@@ -306,8 +304,7 @@
/* Projection only required for checking so convert non-interactively */
if (GPJ_wkt_to_grass(&cellhd, &proj_info,
&proj_units, GDALGetProjectionRef(hDS), 0) < 0)
- G_warning(_
- ("Unable to convert input raster map projection information to "
+ G_warning(_("Unable to convert input raster map projection information to "
"GRASS format for checking"));
else {
/* -------------------------------------------------------------------- */
@@ -409,8 +406,7 @@
G_fatal_error(error_msg);
}
else {
- G_message(_
- ("Projection of input dataset and current location "
+ G_message(_("Projection of input dataset and current location "
"appear to match"));
}
}
@@ -615,8 +611,7 @@
GPJ_wkt_to_grass(&cellhd, &proj_info, &proj_units, pszSrcWKT, 0);
if (pj_get_kv(iproj, proj_info, proj_units) < 0)
- G_fatal_error(_
- ("Unable to translate projection key values of input GCPs"));
+ G_fatal_error(_("Unable to translate projection key values of input GCPs"));
/* -------------------------------------------------------------------- */
/* Get the projection of the target location. */
@@ -632,14 +627,11 @@
/* Get projection info from target location */
if ((out_proj_info = G_get_projinfo()) == NULL)
- G_fatal_error(_
- ("Unable to get projection info of target location"));
+ G_fatal_error(_("Unable to get projection info of target location"));
if ((out_unit_info = G_get_projunits()) == NULL)
- G_fatal_error(_
- ("Unable to get projection units of target location"));
+ G_fatal_error(_("Unable to get projection units of target location"));
if (pj_get_kv(oproj, out_proj_info, out_unit_info) < 0)
- G_fatal_error(_
- ("Unable to get projection key values of target location"));
+ G_fatal_error(_("Unable to get projection key values of target location"));
}
else { /* can't access target mapset */
sprintf(errbuf, _("Mapset <%s> in target location <%s> - "),
@@ -912,8 +904,7 @@
/* found 0..255 data: we set to grey scale: */
struct Colors colors;
- G_verbose_message(_
- ("Setting grey color table for <%s> (8bit, full range)"),
+ G_verbose_message(_("Setting grey color table for <%s> (8bit, full range)"),
output);
G_init_colors(&colors);
@@ -926,8 +917,7 @@
struct Range range;
CELL min, max;
- G_verbose_message(_
- ("Setting grey color table for <%s> (16bit, image range)"),
+ G_verbose_message(_("Setting grey color table for <%s> (16bit, image range)"),
output);
G_read_range((char *)output, G_mapset(), &range);
G_get_range_min_max(&range, &min, &max);
Modified: grass/branches/develbranch_6/raster/r.in.mat/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.mat/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.in.mat/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -465,8 +465,7 @@
break;
default:
G_close_cell(cf);
- G_fatal_error(_
- ("Please contact the GRASS development team"));
+ G_fatal_error(_("Please contact the GRASS development team"));
}
}
rastline_ptr =
Modified: grass/branches/develbranch_6/raster/r.in.xyz/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.xyz/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.in.xyz/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -382,8 +382,7 @@
if (pth_opt->answer != NULL)
pth = atoi(pth_opt->answer);
else
- G_fatal_error(_
- ("Unable to calculate percentile without the pth option specified!"));
+ G_fatal_error(_("Unable to calculate percentile without the pth option specified!"));
method = METHOD_PERCENTILE;
bin_index = TRUE;
}
@@ -395,8 +394,7 @@
if (trim_opt->answer != NULL)
trim = atof(trim_opt->answer) / 100.0;
else
- G_fatal_error(_
- ("Unable to calculate trimmed mean without the trim option specified!"));
+ G_fatal_error(_("Unable to calculate trimmed mean without the trim option specified!"));
method = METHOD_TRIMMEAN;
bin_index = TRUE;
}
@@ -472,8 +470,7 @@
/* can't rewind() non-files */
if (!can_seek && npasses != 1) {
- G_warning(_
- ("If input is not from a file it is only possible to perform a single pass."));
+ G_warning(_("If input is not from a file it is only possible to perform a single pass."));
npasses = 1;
}
Modified: grass/branches/develbranch_6/raster/r.kappa/calc_kappa.c
===================================================================
--- grass/branches/develbranch_6/raster/r.kappa/calc_kappa.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.kappa/calc_kappa.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -29,8 +29,7 @@
if (output == NULL)
fd = stdout;
else if ((fd = fopen(output, "a")) == NULL) {
- G_fatal_error(_
- ("Cannot open file <%s> to write kappa and relevant parameters"),
+ G_fatal_error(_("Cannot open file <%s> to write kappa and relevant parameters"),
output);
return;
}
Modified: grass/branches/develbranch_6/raster/r.kappa/prt_mat.c
===================================================================
--- grass/branches/develbranch_6/raster/r.kappa/prt_mat.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.kappa/prt_mat.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -36,8 +36,7 @@
fd = stdout;
if (fd == NULL) {
- G_fatal_error(_
- ("Cannot open file <%s> to write cats and counts (error matrix)"),
+ G_fatal_error(_("Cannot open file <%s> to write cats and counts (error matrix)"),
output);
return;
}
Modified: grass/branches/develbranch_6/raster/r.lake/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.lake/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.lake/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -209,8 +209,7 @@
G_fatal_error(_("Seed map or seed coordinates must be set!"));
if (sdxy_opt->answer && !lake_opt->answer)
- G_fatal_error(_
- ("Seed coordinates and output map lake= must be set!"));
+ G_fatal_error(_("Seed coordinates and output map lake= must be set!"));
if (lake_opt->answer && overwrite_flag->answer)
G_fatal_error(_("Both lake and overwrite cannot be specifed"));
@@ -301,8 +300,7 @@
if (sdxy_opt->answer)
/* Check is water level higher than seed point */
if (in_terran[start_row][start_col] >= water_level)
- G_fatal_error(_
- ("Given water level at seed point is below earth surface. "
+ G_fatal_error(_("Given water level at seed point is below earth surface. "
"Increase water level or move seed point."));
out_water[start_row][start_col] = 1;
@@ -388,8 +386,7 @@
G_message(_("Lake depth from %f to %f"), min_depth, max_depth);
G_message(_("Lake area %f square meters"), area);
G_message(_("Lake volume %f cubic meters"), volume);
- G_warning(_
- ("Volume is correct only if lake depth (terrain raster map) is in meters"));
+ G_warning(_("Volume is correct only if lake depth (terrain raster map) is in meters"));
/* Close all files. Lake map gets written only now. */
G_close_cell(in_terran_fd);
Modified: grass/branches/develbranch_6/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.daemon/daemon.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.li/r.li.daemon/daemon.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -227,8 +227,7 @@
send(child[j].channel, &m);
wait(&status);
if (!(WIFEXITED(status)))
- G_message(_
- ("r.li.worker (pid %i) exited with abnormal status %i"),
+ G_message(_("r.li.worker (pid %i) exited with abnormal status %i"),
donePid, status);
else
G_message(_("r.li.worker (pid %i) terminated"), donePid);
@@ -249,8 +248,7 @@
send(child[i].channel, &m);
wait(&status);
if (!(WIFEXITED(status)))
- G_message(_
- ("r.li.worker (pid %i) exited with abnormal status %i"),
+ G_message(_("r.li.worker (pid %i) exited with abnormal status %i"),
child[i].pid, status);
else
G_message(_("r.li.worker (pid %i) terminated"), child[i].pid);
Modified: grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -136,8 +136,7 @@
ad->mask_name = mask_preprocessing(toReceive.f.f_ma.mask,
raster, ad->rl, ad->cl);
if (ad->mask_name == NULL) {
- G_message(_
- ("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
+ G_message(_("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
pid, toReceive.f.f_ma.mask);
ad->mask = -1;
}
@@ -147,8 +146,7 @@
erease_mask = 1;
ad->mask = open(ad->mask_name, O_WRONLY, 0755);
if (ad->mask == -1) {
- G_message(_
- ("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
+ G_message(_("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
pid, toReceive.f.f_ma.mask);
}
Modified: grass/branches/develbranch_6/raster/r.los/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.los/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.los/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -145,14 +145,12 @@
patt_flag = TRUE;
if ((G_projection() == PROJECTION_LL))
- G_fatal_error(_
- ("Lat/Long support is not (yet) implemented for this module."));
+ G_fatal_error(_("Lat/Long support is not (yet) implemented for this module."));
/* check if specified observer location inside window */
if (east < window.west || east > window.east
|| north > window.north || north < window.south)
- G_fatal_error(_
- ("Specified observer coordinate is outside current region bounds."));
+ G_fatal_error(_("Specified observer coordinate is outside current region bounds."));
search_mapset = "";
old_mapset = G_find_cell2(elev_layer, search_mapset);
@@ -242,8 +240,7 @@
G_get_ellipsoid_parameters(&aa, &e2);
if (aa == 0) {
/* since there was a problem, take a hardcoded radius :( */
- G_warning(_
- ("Problem to obtain current ellipsoid parameters, using sphere (6370997.0)"));
+ G_warning(_("Problem to obtain current ellipsoid parameters, using sphere (6370997.0)"));
aa = 6370997.00;
}
G_debug(3, "radius: %f", aa);
Modified: grass/branches/develbranch_6/raster/r.mfilter/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.mfilter/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.mfilter/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -128,8 +128,7 @@
/* make sure filter matrix won't extend outside the raster map */
for (i = 0; i < nfilters; i++) {
if (filter[i].size > ncols || filter[i].size > nrows)
- G_fatal_error(_
- ("Raster map too small for the size of the filter"));
+ G_fatal_error(_("Raster map too small for the size of the filter"));
}
Modified: grass/branches/develbranch_6/raster/r.mfilter.fp/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.mfilter.fp/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.mfilter.fp/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -135,8 +135,7 @@
/* make sure filter matrix won't extend outside the raster map */
for (i = 0; i < nfilters; i++) {
if (filter[i].size > ncols || filter[i].size > nrows)
- G_fatal_error(_
- ("Raster map too small for the size of the filter"));
+ G_fatal_error(_("Raster map too small for the size of the filter"));
}
Modified: grass/branches/develbranch_6/raster/r.out.gdal/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.out.gdal/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.out.gdal/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -336,14 +336,12 @@
if (n_nulls > 0) {
if (maptype == CELL_TYPE)
- G_warning(_
- ("Input raster map constains cells with NULL-value (no-data). "
+ G_warning(_("Input raster map constains cells with NULL-value (no-data). "
"The value %d was used to represent no-data values in the input map."
"You can specify nodata value by %s parameter."),
(int)nodataval, nodatakey);
else
- G_warning(_
- ("Input raster map constains cells with NULL-value (no-data). "
+ G_warning(_("Input raster map constains cells with NULL-value (no-data). "
"The value %g was used to represent no-data values in the input map."
"You can specify nodata value by %s parameter."),
nodataval, nodatakey);
@@ -686,8 +684,7 @@
GDALCreate(hDriver, output->answer, cellhead.cols, cellhead.rows,
ref.nfiles, datatype, papszOptions);
if (hDstDS == NULL)
- G_fatal_error(_
- ("Unable to create <%s> dataset using <%s> driver"),
+ G_fatal_error(_("Unable to create <%s> dataset using <%s> driver"),
output->answer, format->answer);
hCurrDS = hDstDS;
}
@@ -738,8 +735,7 @@
GDALCreateCopy(hDriver, output->answer, hMEMDS, FALSE,
papszOptions, NULL, NULL);
if (hDstDS == NULL)
- G_fatal_error(_
- ("Unable to create raster map <%s> using driver <%s>"),
+ G_fatal_error(_("Unable to create raster map <%s> using driver <%s>"),
output->answer, format->answer);
}
Modified: grass/branches/develbranch_6/raster/r.out.pov/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.out.pov/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.out.pov/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -190,8 +190,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
if (nrows > YMAX || ncols > XMAX)
- G_fatal_error(_
- ("Raster map is too big! Exceeds %d columns or %d rows"),
+ G_fatal_error(_("Raster map is too big! Exceeds %d columns or %d rows"),
XMAX, YMAX);
Modified: grass/branches/develbranch_6/raster/r.out.vtk/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.out.vtk/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.out.vtk/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -83,8 +83,7 @@
}
}
else {
- G_fatal_error(_
- ("Cannot create RGB data, please provide three maps [r,g,b]"));
+ G_fatal_error(_("Cannot create RGB data, please provide three maps [r,g,b]"));
}
}
@@ -107,8 +106,7 @@
}
}
else {
- G_fatal_error(_
- ("Cannot create vector data, please provide three maps [x,y,z]"));
+ G_fatal_error(_("Cannot create vector data, please provide three maps [x,y,z]"));
}
}
@@ -333,8 +331,7 @@
digits);
}
else {
- G_warning(_
- ("Wrong RGB maps. Maps should have the same type! RGB output not added!"));
+ G_warning(_("Wrong RGB maps. Maps should have the same type! RGB output not added!"));
/*do nothing */
}
@@ -381,8 +378,7 @@
digits);
}
else {
- G_warning(_
- ("Wrong vector maps. Maps should have the same type! Vector output not added!"));
+ G_warning(_("Wrong vector maps. Maps should have the same type! Vector output not added!"));
/*do nothing */
}
Modified: grass/branches/develbranch_6/raster/r.out.vtk/writeascii.c
===================================================================
--- grass/branches/develbranch_6/raster/r.out.vtk/writeascii.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.out.vtk/writeascii.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -426,8 +426,7 @@
/*Test of valuerange, the data should be 1 byte gray values */
if (r > 255 || g > 255 || b > 255 || r < 0 || g < 0 || b < 0) {
- G_warning(_
- ("Wrong map values! Values should in between 0 and 255!\n"));
+ G_warning(_("Wrong map values! Values should in between 0 and 255!\n"));
fprintf(fp, "0 0 0 \n");
}
else {
Modified: grass/branches/develbranch_6/raster/r.param.scale/interface.c
===================================================================
--- grass/branches/develbranch_6/raster/r.param.scale/interface.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.param.scale/interface.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -160,8 +160,7 @@
else if (!strcmp(parameter->answer, "feature"))
mparam = FEATURE;
else {
- G_warning(_
- ("Morphometric parameter not recognised. Assuming 'Elevation'"));
+ G_warning(_("Morphometric parameter not recognised. Assuming 'Elevation'"));
mparam = ELEV;
}
Modified: grass/branches/develbranch_6/raster/r.param.scale/process.c
===================================================================
--- grass/branches/develbranch_6/raster/r.param.scale/process.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.param.scale/process.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -69,8 +69,7 @@
if ((region.ew_res / region.ns_res >= 1.01) || /* If EW and NS resolns are */
(region.ns_res / region.ew_res >= 1.01)) { /* >1% different, warn user. */
- G_warning(_
- ("E-W and N-S grid resolutions are different. Taking average."));
+ G_warning(_("E-W and N-S grid resolutions are different. Taking average."));
resoln = (region.ns_res + region.ew_res) / 2;
}
else
Modified: grass/branches/develbranch_6/raster/r.profile/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.profile/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.profile/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -307,8 +307,7 @@
G_message(_("Approx. transect length [%f] m"), LEN);
if (!G_point_in_region(e2, n2))
- G_warning(_
- ("Endpoint coordinates are outside of current region settings"));
+ G_warning(_("Endpoint coordinates are outside of current region settings"));
/* Calculate Azimuth of Line */
if (rows == 0 && cols == 0) {
Modified: grass/branches/develbranch_6/raster/r.proj/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.proj/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.proj/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -213,16 +213,13 @@
/* Get projection info for output mapset */
if ((out_proj_info = G_get_projinfo()) == NULL)
- G_fatal_error(_
- ("Unable to get projection info of output raster map"));
+ G_fatal_error(_("Unable to get projection info of output raster map"));
if ((out_unit_info = G_get_projunits()) == NULL)
- G_fatal_error(_
- ("Unable to get projection units of output raster map"));
+ G_fatal_error(_("Unable to get projection units of output raster map"));
if (pj_get_kv(&oproj, out_proj_info, out_unit_info) < 0)
- G_fatal_error(_
- ("Unable to get projection key values of output raster map"));
+ G_fatal_error(_("Unable to get projection key values of output raster map"));
/* Change the location */
G__create_alt_env();
@@ -249,8 +246,7 @@
G_fatal_error(_("Required parameter <%s> not set"), inmap->key);
if (!G_find_cell(inmap->answer, setname))
- G_fatal_error(_
- ("Raster map <%s> in location <%s> in mapset <%s> not found"),
+ G_fatal_error(_("Raster map <%s> in location <%s> in mapset <%s> not found"),
inmap->answer, inlocation->answer, setname);
/* Read input map colour table */
@@ -278,8 +274,7 @@
G_set_window(&incellhd);
if (G_projection() == PROJECTION_XY)
- G_fatal_error(_
- ("Unable to work with unprojected data (xy location)"));
+ G_fatal_error(_("Unable to work with unprojected data (xy location)"));
/* Save default borders so we can show them later */
inorth = incellhd.north;
Modified: grass/branches/develbranch_6/raster/r.proj.seg/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.proj.seg/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.proj.seg/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -219,23 +219,19 @@
setname = imapset->answer ? imapset->answer : G_store(G_mapset());
if (strcmp(inlocation->answer, G_location()) == 0)
- G_fatal_error(_
- ("You have to use a different location for input than the current"));
+ G_fatal_error(_("You have to use a different location for input than the current"));
G_get_window(&outcellhd);
/* Get projection info for output mapset */
if ((out_proj_info = G_get_projinfo()) == NULL)
- G_fatal_error(_
- ("Unable to get projection info of output raster map"));
+ G_fatal_error(_("Unable to get projection info of output raster map"));
if ((out_unit_info = G_get_projunits()) == NULL)
- G_fatal_error(_
- ("Unable to get projection units of output raster map"));
+ G_fatal_error(_("Unable to get projection units of output raster map"));
if (pj_get_kv(&oproj, out_proj_info, out_unit_info) < 0)
- G_fatal_error(_
- ("Unable to get projection key values of output raster map"));
+ G_fatal_error(_("Unable to get projection key values of output raster map"));
/* Change the location */
G__create_alt_env();
@@ -262,8 +258,7 @@
G_fatal_error(_("Required parameter <%s> not set"), inmap->key);
if (!G_find_cell(inmap->answer, setname))
- G_fatal_error(_
- ("Raster map <%s> in location <%s> in mapset <%s> not found"),
+ G_fatal_error(_("Raster map <%s> in location <%s> in mapset <%s> not found"),
inmap->answer, inlocation->answer, setname);
/* Read input map colour table */
@@ -291,8 +286,7 @@
G_set_window(&incellhd);
if (G_projection() == PROJECTION_XY)
- G_fatal_error(_
- ("Unable to work with unprojected data (xy location)"));
+ G_fatal_error(_("Unable to work with unprojected data (xy location)"));
/* Save default borders so we can show them later */
inorth = incellhd.north;
Modified: grass/branches/develbranch_6/raster/r.quant/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.quant/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.quant/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -141,8 +141,7 @@
else if ((sscanf(fprange->answer, "%lf,%lf", &new_dmin, &new_dmax) == 2)
&& (sscanf(range->answer, "%d,%d", &new_min, &new_max) == 2)) {
- G_message(_
- ("Setting quant rules for input map(s) to (%f %f) -> (%d,%d)"),
+ G_message(_("Setting quant rules for input map(s) to (%f %f) -> (%d,%d)"),
new_dmin, new_dmax, new_min, new_max);
G_quant_add_rule(&quant_struct, new_dmin, new_dmax, new_min, new_max);
}
@@ -152,8 +151,7 @@
if (!read_rules()) {
if (isatty(0))
- G_message(_
- ("No rules specified. Quant table(s) not changed."));
+ G_message(_("No rules specified. Quant table(s) not changed."));
else
G_fatal_error("No rules specified");
}
Modified: grass/branches/develbranch_6/raster/r.random/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.random/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.random/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -171,18 +171,15 @@
else {
if (targets > count) {
if (myState.use_nulls)
- G_fatal_error(_
- ("There aren't [%ld] cells in the current region"),
+ G_fatal_error(_("There aren't [%ld] cells in the current region"),
targets);
else
- G_fatal_error(_
- ("There aren't [%ld] non-NULL cells in the current region"),
+ G_fatal_error(_("There aren't [%ld] non-NULL cells in the current region"),
targets);
}
if (targets <= 0)
- G_fatal_error(_
- ("There are no valid locations in the current region"));
+ G_fatal_error(_("There are no valid locations in the current region"));
myState.nRand = targets;
}
Modified: grass/branches/develbranch_6/raster/r.random/random.c
===================================================================
--- grass/branches/develbranch_6/raster/r.random/random.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.random/random.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -124,15 +124,13 @@
for (row = 0; row < nrows && nt; row++) {
if (G_get_raster_row
(infd, theState->buf.data.v, row, theState->buf.type) < 0)
- G_fatal_error(_
- ("Cannot read raster row [%d] from raster map <%s>"),
+ G_fatal_error(_("Cannot read raster row [%d] from raster map <%s>"),
row, theState->inraster);
if (theState->docover == 1) {
if (G_get_raster_row
(cinfd, theState->cover.data.v, row,
theState->cover.type) < 0)
- G_fatal_error(_
- ("Cannot read raster row [%d] from cover raster map <%s>"),
+ G_fatal_error(_("Cannot read raster row [%d] from cover raster map <%s>"),
row, theState->inrcover);
}
Modified: grass/branches/develbranch_6/raster/r.random.surface/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.random.surface/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.random.surface/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -70,8 +70,7 @@
for (DoFilter = 0; DoFilter < NumFilters; DoFilter++) {
CopyFilter(&Filter, AllFilters[DoFilter]);
- G_message(_
- ("Starting filter #%d, distance: %.*lf, exponent: %.*lf, flat: %.*lf"),
+ G_message(_("Starting filter #%d, distance: %.*lf, exponent: %.*lf, flat: %.*lf"),
DoFilter, Digits(2.0 * Filter.MaxDist, 6),
2.0 * Filter.MaxDist, Digits(1.0 / Filter.Exp, 6),
1.0 / Filter.Exp, Digits(Filter.Mult, 6), Filter.Mult);
Modified: grass/branches/develbranch_6/raster/r.reclass/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.reclass/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.reclass/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -136,8 +136,7 @@
if (!any) {
if (tty)
- G_fatal_error(_
- ("No rules specified. Raster map <%s> not created"),
+ G_fatal_error(_("No rules specified. Raster map <%s> not created"),
parm.output->answer);
else
G_fatal_error(_("No rules specified"));
Modified: grass/branches/develbranch_6/raster/r.reclass/parse.c
===================================================================
--- grass/branches/develbranch_6/raster/r.reclass/parse.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.reclass/parse.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -55,8 +55,7 @@
if (!scan_value(&v))
return -1;
if (G_is_c_null_value(&v)) {
- G_warning(_
- ("Can't have null on the left-hand side of the rule"));
+ G_warning(_("Can't have null on the left-hand side of the rule"));
return -1;
}
state = 1;
@@ -85,8 +84,7 @@
if (strncmp(cur, "thru", 4) != 0)
continue;
if (last_null) {
- G_warning(_
- ("Can't have null on the right-hand side of the rule"));
+ G_warning(_("Can't have null on the right-hand side of the rule"));
return -1;
}
cur += 4;
@@ -98,8 +96,7 @@
if (!scan_value(&v))
return -1;
if (G_is_c_null_value(&v)) {
- G_warning(_
- ("Can't have null on the right-hand side of the rule"));
+ G_warning(_("Can't have null on the right-hand side of the rule"));
return -1;
}
Modified: grass/branches/develbranch_6/raster/r.recode/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.recode/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.recode/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -97,8 +97,7 @@
if (!read_rules(srcfp)) {
if (isatty(fileno(srcfp)))
- G_fatal_error(_
- ("No rules specified. Raster map <%s> not created."),
+ G_fatal_error(_("No rules specified. Raster map <%s> not created."),
result);
else
G_fatal_error(_("No rules specified"));
Modified: grass/branches/develbranch_6/raster/r.recode/read_rules.c
===================================================================
--- grass/branches/develbranch_6/raster/r.recode/read_rules.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.recode/read_rules.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -79,12 +79,9 @@
if (strcmp(buf, "help") == 0) {
G_message(_("Enter a rule in one of these formats:"));
G_message(_("old_low:old_high:new_low:new_high"));
- G_message(_
- ("old_low:old_high:new_val (i.e. new_high == new_low)"));
- G_message(_
- ("*:old_val:new_val (interval [inf, old_val])"));
- G_message(_
- ("old_val:*:new_val (interval [old_val, inf])"));
+ G_message(_("old_low:old_high:new_val (i.e. new_high == new_low)"));
+ G_message(_("*:old_val:new_val (interval [inf, old_val])"));
+ G_message(_("old_val:*:new_val (interval [old_val, inf])"));
continue;
}
Modified: grass/branches/develbranch_6/raster/r.resamp.rst/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.resamp.rst/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.resamp.rst/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -343,8 +343,7 @@
if (sscanf(parm.scalex->answer, "%lf", &scalex) != 1)
G_fatal_error(_("Invalid value for scalex"));
if (!parm.theta->answer)
- G_fatal_error(_
- ("When using anisotropy both theta and scalex must be specified"));
+ G_fatal_error(_("When using anisotropy both theta and scalex must be specified"));
}
/*
@@ -432,8 +431,7 @@
G_fatal_error(_("[%s]: Cannot read map header"), input);
if ((winhd.ew_res != inphd.ew_res) || (winhd.ns_res != inphd.ns_res))
- G_fatal_error(_
- ("Input map resolution differs from current region resolution!"));
+ G_fatal_error(_("Input map resolution differs from current region resolution!"));
if ((fdinp = G_open_cell_old(input, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), input);
@@ -525,8 +523,7 @@
/* change region to initial region */
G_message(_("Changing back to the original region ..."));
if (G_set_window(&winhd) < 0)
- G_fatal_error(_
- ("Cannot set region to back to the initial region !!!"));
+ G_fatal_error(_("Cannot set region to back to the initial region !!!"));
ertot = 0.;
cursegm = 0;
Modified: grass/branches/develbranch_6/raster/r.slope.aspect/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.slope.aspect/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.slope.aspect/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -1034,8 +1034,7 @@
G_set_raster_cats_title
("Aspect counterclockwise in degrees from east", &cats);
- G_verbose_message(_
- ("Min computed aspect %.4f, max computed aspect %.4f"),
+ G_verbose_message(_("Min computed aspect %.4f, max computed aspect %.4f"),
min_asp, max_asp);
/* the categries quant intervals are 1.0 long, plus
we are using reverse order so that the label looked up
@@ -1139,8 +1138,7 @@
else if (perc)
G_set_raster_cats_title("percent slope", &cats);
- G_verbose_message(_
- ("Min computed slope %.4f, max computed slope %.4f"),
+ G_verbose_message(_("Min computed slope %.4f, max computed slope %.4f"),
min_slp, max_slp);
/* the categries quant intervals are 1.0 long, plus
we are using reverse order so that the label looked up
Modified: grass/branches/develbranch_6/raster/r.statistics/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.statistics/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.statistics/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -79,15 +79,13 @@
G_fatal_error(_("Raster map <%s> not found"), basemap->answer);
if (G_raster_map_is_fp(basemap->answer, mapset) != 0)
- G_fatal_error(_
- ("This module currently only works for integer (CELL) maps"));
+ G_fatal_error(_("This module currently only works for integer (CELL) maps"));
if ((mapset = G_find_cell2(covermap->answer, "")) == 0)
G_fatal_error(_("Raster map <%s> not found"), covermap->answer);
if (G_raster_map_is_fp(covermap->answer, mapset) != 0)
- G_fatal_error(_
- ("This module currently only works for integer (CELL) maps"));
+ G_fatal_error(_("This module currently only works for integer (CELL) maps"));
if (G_read_cats(covermap->answer, mapset, &cats) < 0) {
G_fatal_error(_("Unable to read category file of raster map <%s@%s>"),
@@ -186,8 +184,7 @@
static int is_ok(char *method, char *map)
{
if (map == NULL)
- G_fatal_error(_
- ("An output raster map needs to be defined with method '%s'"),
+ G_fatal_error(_("An output raster map needs to be defined with method '%s'"),
method);
return 0;
Modified: grass/branches/develbranch_6/raster/r.stats/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.stats/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.stats/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -287,24 +287,21 @@
G_quant_init(&q);
if (cat_ranges) {
if (!G_quant_nof_rules(&labels[nfiles].q)) {
- G_warning(_
- ("Cats for raster map <%s> are either missing or have no explicit labels. "
+ G_warning(_("Cats for raster map <%s> are either missing or have no explicit labels. "
"Using %s=%d."), G_fully_qualified_name(name,
mapset),
option.nsteps->key, nsteps);
cat_ranges = 0;
}
else if (nsteps != 255)
- G_warning(_
- ("Flag '-%c' was given, using cats fp ranges of raster map <%s>, "
+ G_warning(_("Flag '-%c' was given, using cats fp ranges of raster map <%s>, "
"ignoring '%s' option"), flag.C->key,
G_fully_qualified_name(name, mapset),
option.nsteps->key);
}
if (!cat_ranges) { /* DO NOT use else here, cat_ranges can change */
if (G_read_fp_range(name, mapset, &fp_range) < 0)
- G_fatal_error(_
- ("Unable to read fp range of raster map <%s>"),
+ G_fatal_error(_("Unable to read fp range of raster map <%s>"),
G_fully_qualified_name(name, mapset));
G_get_fp_range_min_max(&fp_range, &DMIN[nfiles],
&DMAX[nfiles]);
Modified: grass/branches/develbranch_6/raster/r.sun/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.sun/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.sun/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -425,15 +425,13 @@
if (parm.ltime->answer != NULL) {
if (insol_time != NULL)
G_fatal_error(_("time and insol_time are incompatible options"));
- G_message(_
- ("Mode 1: instantaneous solar incidence angle & irradiance given a set local time"));
+ G_message(_("Mode 1: instantaneous solar incidence angle & irradiance given a set local time"));
sscanf(parm.ltime->answer, "%lf", &timo);
}
else {
if (incidout != NULL)
G_fatal_error(_("incidout requires time parameter to be set"));
- G_message(_
- ("Mode 2: integrated daily irradiation for a given day of the year"));
+ G_message(_("Mode 2: integrated daily irradiation for a given day of the year"));
}
if (parm.linkein->answer == NULL)
@@ -482,12 +480,10 @@
if ((in_proj_info = G_get_projinfo()) == NULL)
G_fatal_error
- (_
- ("Can't get projection info of current location: please set latitude via 'lat' or 'latin' option!"));
+ (_("Can't get projection info of current location: please set latitude via 'lat' or 'latin' option!"));
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
@@ -501,8 +497,7 @@
oproj.meters = 1.;
sprintf(oproj.proj, "ll");
if ((oproj.pj = pj_latlong_from_proj(iproj.pj)) == NULL)
- G_fatal_error(_
- ("Unable to set up lat/long projection parameters"));
+ G_fatal_error(_("Unable to set up lat/long projection parameters"));
}
Modified: grass/branches/develbranch_6/raster/r.sunmask/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.sunmask/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.sunmask/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -286,23 +286,19 @@
locparms = 0;
if (solparms && locparms) /* both defined */
- G_fatal_error(_
- ("Either define sun position or location/date/time parameters."));
+ G_fatal_error(_("Either define sun position or location/date/time parameters."));
if (!solparms && !locparms) /* nothing defined */
- G_fatal_error(_
- ("Neither sun position nor east/north, date/time/timezone definition are complete."));
+ G_fatal_error(_("Neither sun position nor east/north, date/time/timezone definition are complete."));
/* if here, one definition was complete */
if (locparms) {
- G_message(_
- ("Calculating sun position... (using solpos (V. %s) from NREL)\n"),
+ G_message(_("Calculating sun position... (using solpos (V. %s) from NREL)\n"),
SOLPOSVERSION);
use_solpos = 1;
}
else {
- G_message(_
- ("Using user defined sun azimuth, altitude settings (ignoring eventual other values)\n"));
+ G_message(_("Using user defined sun azimuth, altitude settings (ignoring eventual other values)\n"));
use_solpos = 0;
}
@@ -381,8 +377,7 @@
}
}
else {
- G_message(_
- (" %d.%02d.%02d, daynum %d, time: %02i:%02i:%02i (decimal time: %f)\n"),
+ G_message(_(" %d.%02d.%02d, daynum %d, time: %02i:%02i:%02i (decimal time: %f)\n"),
pdat->year, pdat->month, pdat->day,
pdat->daynum, pdat->hour, pdat->minute,
pdat->second,
@@ -392,16 +387,13 @@
G_message(_(" long: %f, lat: %f, timezone: %f\n"),
pdat->longitude, pdat->latitude,
pdat->timezone);
- G_message(_
- (" Solar position: sun azimuth: %f,\n sun angle above horz.(refraction corrected): %f\n"),
+ G_message(_(" Solar position: sun azimuth: %f,\n sun angle above horz.(refraction corrected): %f\n"),
pdat->azim, pdat->elevref);
if (sretr / 60 <= 24.0) {
- G_message(_
- (" Sunrise time (without refraction): %02d:%02d:%02d\n"),
+ G_message(_(" Sunrise time (without refraction): %02d:%02d:%02d\n"),
sretr / 60, sretr % 60, sretr_sec);
- G_message(_
- (" Sunset time (without refraction): %02d:%02d:%02d\n"),
+ G_message(_(" Sunset time (without refraction): %02d:%02d:%02d\n"),
ssetr / 60, ssetr % 60, ssetr_sec);
}
}
@@ -426,8 +418,7 @@
G_debug(3, "current_time:%f sunrise:%f", current_time, sunrise);
if ((current_time < sunrise)) {
if (sretr / 60 <= 24.0)
- G_message(_
- ("Time (%02i:%02i:%02i) is before sunrise (%02d:%02d:%02d)!\n"),
+ G_message(_("Time (%02i:%02i:%02i) is before sunrise (%02d:%02d:%02d)!\n"),
pdat->hour, pdat->minute, pdat->second, sretr / 60,
sretr % 60, sretr_sec);
else
@@ -438,8 +429,7 @@
}
if ((current_time > sunset)) {
if (sretr / 60 <= 24.0)
- G_message(_
- ("Time (%02i:%02i:%02i) is after sunset (%02d:%02d:%02d)!\n"),
+ G_message(_("Time (%02i:%02i:%02i) is after sunset (%02d:%02d:%02d)!\n"),
pdat->hour, pdat->minute, pdat->second, ssetr / 60,
ssetr % 60, ssetr_sec);
else
Modified: grass/branches/develbranch_6/raster/r.support/front/front.c
===================================================================
--- grass/branches/develbranch_6/raster/r.support/front/front.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.support/front/front.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -227,8 +227,7 @@
G_fatal_error(_("Unable to open raster map <%s>"), infile);
G_init_cats((CELL) 0, "", &cats);
if (0 > G_read_cats(map_opt->answer, cmapset, &cats))
- G_fatal_error(_
- ("Unable to read category file of raster map <%s@%s>"),
+ G_fatal_error(_("Unable to read category file of raster map <%s@%s>"),
map_opt->answer, cmapset);
if (G_write_cats(infile, &cats) >= 0)
Modified: grass/branches/develbranch_6/raster/r.support/modhead/modhead.c
===================================================================
--- grass/branches/develbranch_6/raster/r.support/modhead/modhead.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.support/modhead/modhead.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -83,13 +83,11 @@
/* Make sure map is not reclassed */
if (G_is_reclass(name, mapset, rname, rmapset) > 0) {
if (strcmp(mapset, rmapset) == 0)
- G_fatal_error(_
- ("[%s] is a reclass of [%s] - cannot edit header! Run support on [%s]."),
+ G_fatal_error(_("[%s] is a reclass of [%s] - cannot edit header! Run support on [%s]."),
name, rname, rname);
/* ELSE */
- G_fatal_error(_
- ("[%s] is a reclass of [%s in %s] - cannot edit header!"),
+ G_fatal_error(_("[%s] is a reclass of [%s in %s] - cannot edit header!"),
name, rname, rmapset);
}
@@ -206,8 +204,7 @@
if ((compressed_new || compressed_old) && G_yes(buffer, -1)) {
if (compressed_new && compressed_old) {
while (1) {
- G_message(_
- ("Please indicate the type of compression:\n"));
+ G_message(_("Please indicate the type of compression:\n"));
G_message(_(" 1. Pre 3.0 compression\n"));
G_message(_(" 2. 3.0 compression\n"));
if (!G_gets(buffer))
@@ -245,12 +242,10 @@
cellhd.compressed = 0;
if ((cellhd.compressed == 0) && compressed_new) {
- G_warning(_
- ("The header for [%s] says the file is not compressed. "),
+ G_warning(_("The header for [%s] says the file is not compressed. "),
name);
G_warning(_("The file appears to be compressed.\n"));
- G_warning(_
- ("Most likely the header is wrong, but I want you to decide.\n"));
+ G_warning(_("Most likely the header is wrong, but I want you to decide.\n"));
if (G_yes("Is the file compressed? ", -1))
cellhd.compressed = 1;
@@ -259,8 +254,7 @@
G_warning(_("The header for [%s] says the file is compressed. "),
name);
G_warning(_("The file does NOT appear to be compressed.\n"));
- G_warning(_
- ("Most likely the header is wrong, but I want you to decide.\n"));
+ G_warning(_("Most likely the header is wrong, but I want you to decide.\n"));
if (!G_yes("Is the file really compressed? ", -1))
cellhd.compressed = 0;
Modified: grass/branches/develbranch_6/raster/r.support/modhist/modhist.c
===================================================================
--- grass/branches/develbranch_6/raster/r.support/modhist/modhist.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.support/modhist/modhist.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -35,8 +35,7 @@
if (argc < 2) {
mapset =
- G_ask_cell_in_mapset(_
- ("Which raster map needs an updated history? "),
+ G_ask_cell_in_mapset(_("Which raster map needs an updated history? "),
name);
if (mapset == NULL)
return EXIT_SUCCESS;
Modified: grass/branches/develbranch_6/raster/r.surf.fractal/interface.c
===================================================================
--- grass/branches/develbranch_6/raster/r.surf.fractal/interface.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.surf.fractal/interface.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -95,8 +95,7 @@
/*--------------------------------------------------------------------*/
if ((H <= 0) || (H >= 1)) {
- G_fatal_error(_
- ("Fractal dimension of [%.2lf] must be between 2 and 3."),
+ G_fatal_error(_("Fractal dimension of [%.2lf] must be between 2 and 3."),
3.0 - H);
}
Modified: grass/branches/develbranch_6/raster/r.surf.idw2/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.surf.idw2/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.surf.idw2/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -77,8 +77,7 @@
/* Make sure that the current projection is not lat/long */
if ((G_projection() == PROJECTION_LL))
- G_fatal_error(_
- ("Lat/long databases not supported by r.surf.idw2. Use r.surf.idw instead!"));
+ G_fatal_error(_("Lat/long databases not supported by r.surf.idw2. Use r.surf.idw instead!"));
if (G_legal_filename(parm.output->answer) < 0)
G_fatal_error(_("<%s> is an illegal file name"), parm.output->answer);
Modified: grass/branches/develbranch_6/raster/r.texture/h_measure.c
===================================================================
--- grass/branches/develbranch_6/raster/r.texture/h_measure.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.texture/h_measure.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -924,8 +924,7 @@
}
else {
if (its == 30)
- G_fatal_error(_
- ("Too many iterations to required to find %s - giving up"),
+ G_fatal_error(_("Too many iterations to required to find %s - giving up"),
F14), exit(1);
if (its == 10 || its == 20) {
t += x;
Modified: grass/branches/develbranch_6/raster/r.texture/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.texture/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.texture/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -210,8 +210,7 @@
if (a && c && corr && v && idm && sa && sv && se && e && dv && de && moc1
&& moc2 && mcc)
- G_fatal_error(_
- ("Nothing to compute. Use at least one of the flags."));
+ G_fatal_error(_("Nothing to compute. Use at least one of the flags."));
/* please, remove before GRASS 7 released */
if (flag1->answer) {
@@ -351,8 +350,7 @@
for (j = 0; j < (size / 2); j++)
if (G_put_raster_row(outfd, outrast, out_data_type) <
0)
- G_fatal_error(_
- ("Failed writing raster map <%s> row %d"),
+ G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
if (G_put_raster_row(outfd, outrast, out_data_type) < 0)
@@ -363,13 +361,11 @@
if ((row >= nrows - (size - 1)) && (row < nrows))
for (j = 0; j < (size / 2); j++)
if (G_put_raster_row(outfd, outrast, out_data_type) < 0)
- G_fatal_error(_
- ("Failed writing raster map <%s> row %d"),
+ G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
G_close_cell(outfd);
- G_important_message(_
- ("Calculated measure #%d (56 measures available)"),
+ G_important_message(_("Calculated measure #%d (56 measures available)"),
(t_measure + 1));
}
G_free(outrast);
Modified: grass/branches/develbranch_6/raster/r.thin/io.c
===================================================================
--- grass/branches/develbranch_6/raster/r.thin/io.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.thin/io.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -112,8 +112,7 @@
close(creat(work_file_name, 0666));
if ((work_file = open(work_file_name, 2)) < 0) {
unlink(work_file_name);
- G_fatal_error(_
- ("%s: Unable to create temporary file <%s> -- errno = %d"),
+ G_fatal_error(_("%s: Unable to create temporary file <%s> -- errno = %d"),
error_prefix, work_file_name, errno);
}
buf = (CELL *) G_malloc(buf_len = n_cols * sizeof(CELL));
@@ -129,8 +128,7 @@
for (row = 0; row < n_rows; row++) {
if (G_get_map_row(cell_file, buf + PAD, row) < 0) {
unlink(work_file_name);
- G_fatal_error(_
- ("%s: Error reading from raster map <%s> in mapset <%s>"),
+ G_fatal_error(_("%s: Error reading from raster map <%s> in mapset <%s>"),
error_prefix, cell, mapset);
}
if (write(work_file, buf, buf_len) != buf_len) {
Modified: grass/branches/develbranch_6/raster/r.thin/thin_lines.c
===================================================================
--- grass/branches/develbranch_6/raster/r.thin/thin_lines.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.thin/thin_lines.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -173,8 +173,7 @@
if ((deleted == 0) && (i <= iterations))
G_message(_("Thinning completed successfully."));
else
- G_message(_
- ("Thinning not completed, consider to increase 'iterations' parameter."));
+ G_message(_("Thinning not completed, consider to increase 'iterations' parameter."));
return 0;
}
Modified: grass/branches/develbranch_6/raster/r.to.rast3/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.rast3/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.to.rast3/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -219,8 +219,7 @@
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
- G_message(_
- ("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
+ G_message(_("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
Modified: grass/branches/develbranch_6/raster/r.to.rast3elev/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.rast3elev/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.to.rast3elev/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -135,8 +135,7 @@
}
if (elevcount != inputcount) {
- G_fatal_error(_
- ("The number of input and elevation maps is not equal"));
+ G_fatal_error(_("The number of input and elevation maps is not equal"));
exit(EXIT_FAILURE);
}
@@ -461,8 +460,7 @@
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
- G_message(_
- ("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
+ G_message(_("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
Modified: grass/branches/develbranch_6/raster/r.to.vect/lines.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.vect/lines.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.to.vect/lines.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -490,8 +490,7 @@
break;
default:
G_debug(1, "Crowded cell %xH (%d,%d)", count, row, col);
- G_fatal_error(_
- ("Raster map is not thinned properly.\nPlease run r.thin."));
+ G_fatal_error(_("Raster map is not thinned properly.\nPlease run r.thin."));
} /* switch count */
return 0;
Modified: grass/branches/develbranch_6/raster/r.to.vect/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.to.vect/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.to.vect/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -120,8 +120,7 @@
G_get_window(&cell_head);
if (value_flag && data_type != CELL_TYPE) {
- G_warning(_
- ("Raster is not CELL, '-v' flag ignored, raster values will be written to the table."));
+ G_warning(_("Raster is not CELL, '-v' flag ignored, raster values will be written to the table."));
value_flag = 0;
}
Modified: grass/branches/develbranch_6/raster/r.topidx/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.topidx/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.topidx/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -52,8 +52,7 @@
/* Make sure that the current projection is not lat/long */
if ((G_projection() == PROJECTION_LL))
- G_fatal_error(_
- ("Lat/Long location is not supported by %s. Please reproject map first."),
+ G_fatal_error(_("Lat/Long location is not supported by %s. Please reproject map first."),
G_program_name());
iname = params.input->answer;
Modified: grass/branches/develbranch_6/raster/r.walk/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.walk/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.walk/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -493,8 +493,7 @@
if (!G_is_d_null_value(&null_cost)) {
if (null_cost < 0.0) {
- G_warning(_
- ("Warning: assigning negative cost to null cell. Null cells excluded."));
+ G_warning(_("Warning: assigning negative cost to null cell. Null cells excluded."));
G_set_d_null_value(&null_cost, 1);
}
}
@@ -819,8 +818,7 @@
fbuff = (double *)G_malloc((unsigned int)(ncols * sizeof(double)));
if (fbuff == NULL)
- G_fatal_error(_
- ("Unable to allocate memory for segment fbuff == NULL"));
+ G_fatal_error(_("Unable to allocate memory for segment fbuff == NULL"));
G_set_d_null_value(fbuff, ncols);
@@ -849,8 +847,7 @@
cum_cost_mapset = G_find_cell2(cum_cost_layer, search_mapset);
if (cum_cost_mapset == NULL)
- G_fatal_error(_
- ("Raster output map <%s> not found (no start_points given)"),
+ G_fatal_error(_("Raster output map <%s> not found (no start_points given)"),
cum_cost_layer);
cum_fd = G_open_cell_old(cum_cost_layer, cum_cost_mapset);
@@ -865,8 +862,7 @@
cell2 = G_allocate_raster_buf(data_type2);
if (cell2 == NULL)
- G_fatal_error(_
- ("Memory allocation error on reading start points from raster map %s"),
+ G_fatal_error(_("Memory allocation error on reading start points from raster map %s"),
cum_cost_layer);
G_message(_("Reading %s... "), cum_cost_layer);
@@ -916,8 +912,7 @@
value_start_pt = &zero;
if (top_start_pt->row < 0 || top_start_pt->row >= nrows
|| top_start_pt->col < 0 || top_start_pt->col >= ncols)
- G_fatal_error(_
- ("Specified starting location outside database window"));
+ G_fatal_error(_("Specified starting location outside database window"));
new_cell = insert(zero, top_start_pt->row, top_start_pt->col);
segment_put(&out_seg, value_start_pt, top_start_pt->row,
top_start_pt->col);
@@ -1416,8 +1411,7 @@
G_percent(row, nrows, 2);
if (keep_nulls) {
if (G_get_raster_row(dtm_fd, cell2, row, dtm_data_type) < 0)
- G_fatal_error(_
- ("Unable to read raster map <%s> row %d"),
+ G_fatal_error(_("Unable to read raster map <%s> row %d"),
dtm_layer, row);
}
p = cum_cell;
@@ -1452,8 +1446,7 @@
G_percent(row, nrows, 2);
if (keep_nulls) {
if (G_get_raster_row(dtm_fd, cell2, row, dtm_data_type) < 0)
- G_fatal_error(_
- ("Unable to read raster map <%s> row %d"),
+ G_fatal_error(_("Unable to read raster map <%s> row %d"),
dtm_layer, row);
}
p = cum_cell;
Modified: grass/branches/develbranch_6/raster/r.water.outlet/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.water.outlet/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.water.outlet/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -100,8 +100,7 @@
if (E < window.west || E > window.east || N < window.south ||
N > window.north) {
- G_warning(_
- ("Warning, ignoring point outside window: \n %.4f,%.4f\n"),
+ G_warning(_("Warning, ignoring point outside window: \n %.4f,%.4f\n"),
E, N);
}
Modified: grass/branches/develbranch_6/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/branches/develbranch_6/raster/r.watershed/seg/init_vars.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.watershed/seg/init_vars.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -85,8 +85,7 @@
if (bas_thres > 0)
tot_parts++;
- G_message(_
- ("SECTION 1 beginning: Initiating Variables. %d sections total."),
+ G_message(_("SECTION 1 beginning: Initiating Variables. %d sections total."),
tot_parts);
this_mapset = G_mapset();
Modified: grass/branches/develbranch_6/raster/r.watershed/shed/basin_maps.c
===================================================================
--- grass/branches/develbranch_6/raster/r.watershed/shed/basin_maps.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.watershed/shed/basin_maps.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -9,12 +9,9 @@
char *mapset, map_layer[48];
int i;
- G_message(_
- ("\n\nPlease indicate which map layers you wish to use in the lumped"));
- G_message(_
- ("parameter hydrologic/soil erosion model. Continue inputing cell map"));
- G_message(_
- ("layers, one at a time, until all desired map layers are in."));
+ G_message(_("\n\nPlease indicate which map layers you wish to use in the lumped"));
+ G_message(_("parameter hydrologic/soil erosion model. Continue inputing cell map"));
+ G_message(_("layers, one at a time, until all desired map layers are in."));
G_message(_("You can have %s include a list of categories in each."),
G_program_name());
G_message(_("\nHit <return> at the map prompt to continue with %s"),
@@ -38,16 +35,13 @@
G_message(_("\nThe output from %s will be divided into watershed"),
G_program_name());
- G_message(_
- ("basins. There are two possible methods of tabulating the information:"));
- G_message(_
- ("1) by only including data pertaining to the basin itself, or 2) using"));
+ G_message(_("basins. There are two possible methods of tabulating the information:"));
+ G_message(_("1) by only including data pertaining to the basin itself, or 2) using"));
G_message(_("data from the basin, and all basins upstream of it."));
do {
G_message(_("\nWould you like the data organized:"));
- G_message(_
- ("1) Basin only\n2) Upstream only\n3) Both\nOR 0) to cancel program"));
+ G_message(_("1) Basin only\n2) Upstream only\n3) Both\nOR 0) to cancel program"));
fprintf(stderr, _("\nYour choice: "));
G_gets(map_layer);
sscanf(map_layer, "%d", &i);
Modified: grass/branches/develbranch_6/raster/r.watershed/shed/com_line.c
===================================================================
--- grass/branches/develbranch_6/raster/r.watershed/shed/com_line.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.watershed/shed/com_line.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -18,28 +18,20 @@
input->haf_name = (char *)G_calloc(40, sizeof(char));
input->accum_name = (char *)G_calloc(40, sizeof(char));
- G_message(_
- ("\nThis set of questions will organize the command line for the"));
+ G_message(_("\nThis set of questions will organize the command line for the"));
G_message(_("%s program to run properly for your application."),
NON_NAME);
G_message(_("The first question is whether you want %s to run"),
NON_NAME);
G_message(_("in its fast mode or its slow mode. If you run %s"),
NON_NAME);
- G_message(_
- ("in the fast mode, the computer will finish about 10 times faster"));
- G_message(_
- ("than in the slow mode, but will not allow other programs to run"));
- G_message(_
- ("at the same time. The fast mode also places all of the data into"));
- G_message(_
- ("RAM, which limits the size of window that can be run. The slow"));
- G_message(_
- ("mode uses disk space in the same hard disk partition as where GRASS is"));
- G_message(_
- ("stored. Thus, if the program does not work in the slow mode, you will"));
- G_message(_
- ("need to remove unnecessary files from that partition. The slow mode"));
+ G_message(_("in the fast mode, the computer will finish about 10 times faster"));
+ G_message(_("than in the slow mode, but will not allow other programs to run"));
+ G_message(_("at the same time. The fast mode also places all of the data into"));
+ G_message(_("RAM, which limits the size of window that can be run. The slow"));
+ G_message(_("mode uses disk space in the same hard disk partition as where GRASS is"));
+ G_message(_("stored. Thus, if the program does not work in the slow mode, you will"));
+ G_message(_("need to remove unnecessary files from that partition. The slow mode"));
G_message(_("will allow other processes to run concurrently with %s.\n"),
NON_NAME);
@@ -72,8 +64,7 @@
"%s/etc/water/%s", G_getenv("GISBASE"), SEG_NAME);
}
- G_message(_
- ("\nIf you hit <return> by itself for the next question, this"));
+ G_message(_("\nIf you hit <return> by itself for the next question, this"));
G_message(_("program will terminate."));
mapset = G_ask_old("What is the name of the elevation map layer?",
@@ -87,17 +78,12 @@
G_message(_("\nOne of the options for %s is a `depression map'. A"),
prog_name);
- G_message(_
- ("depression map indicates all the locations in the current map window where"));
- G_message(_
- ("water accumulates and does not leave by the edge of the map. Lakes without"));
- G_message(_
- ("outlet streams and sinkholes are examples of `depressions'. If you wish to"));
- G_message(_
- ("have a depression map, prepare a map where non-zero values indicate the"));
+ G_message(_("depression map indicates all the locations in the current map window where"));
+ G_message(_("water accumulates and does not leave by the edge of the map. Lakes without"));
+ G_message(_("outlet streams and sinkholes are examples of `depressions'. If you wish to"));
+ G_message(_("have a depression map, prepare a map where non-zero values indicate the"));
G_message(_("locations where depressions occur.\n"));
- G_message(_
- ("Hit <return> by itself for the next question if there is no depression map."));
+ G_message(_("Hit <return> by itself for the next question if there is no depression map."));
mapset = G_ask_old("What is the name of the depression map layer?",
map_layer, "cell", "cell");
@@ -108,43 +94,28 @@
com_line_add(&(input->com_line_seg), " de=", map_layer, mapset);
}
- G_message(_
- ("\nThe %s program will divide the elevation map into a number of"),
+ G_message(_("\nThe %s program will divide the elevation map into a number of"),
prog_name);
- G_message(_
- ("watershed basins. The number of watershed basins is indirectly determined"));
- G_message(_
- ("by the `basin threshold' value. The basin threshold is the area necessary for"));
- G_message(_
- ("%s to define a unique watershed basin. This area only applies to"),
+ G_message(_("watershed basins. The number of watershed basins is indirectly determined"));
+ G_message(_("by the `basin threshold' value. The basin threshold is the area necessary for"));
+ G_message(_("%s to define a unique watershed basin. This area only applies to"),
prog_name);
- G_message(_
- ("`exterior drainage basins'. An exterior drainage basin does not have any"));
- G_message(_
- ("drainage basins flowing into it. Interior drainage basin size is determined"));
- G_message(_
- ("by the surface flow going into stream segments between stream interceptions."));
- G_message(_
- ("Thus interior drainage basins can be of any size. The %s program"),
+ G_message(_("`exterior drainage basins'. An exterior drainage basin does not have any"));
+ G_message(_("drainage basins flowing into it. Interior drainage basin size is determined"));
+ G_message(_("by the surface flow going into stream segments between stream interceptions."));
+ G_message(_("Thus interior drainage basins can be of any size. The %s program"),
prog_name);
- G_message(_
- ("also allows the user to relate basin size to potential overland flow"));
- G_message(_
- ("(i.e., areas with low infiltration capacities will need smaller areas to"));
- G_message(_
- ("develop stream channels than neighboring areas with high infiltration rates)."));
- G_message(_
- ("The user can create a map layer with potential overland flow values, and"));
+ G_message(_("also allows the user to relate basin size to potential overland flow"));
+ G_message(_("(i.e., areas with low infiltration capacities will need smaller areas to"));
+ G_message(_("develop stream channels than neighboring areas with high infiltration rates)."));
+ G_message(_("The user can create a map layer with potential overland flow values, and"));
G_message(_("%s will accumulate those values instead of area.\n"),
prog_name);
- G_message(_
- ("What unit of measure will you use for the basin threshold:"));
+ G_message(_("What unit of measure will you use for the basin threshold:"));
do {
- G_message(_
- (" 1) acres, 2) meters sq., 3) miles sq., 4) hectares,"));
- G_message(_
- (" 5) kilometers sq., 6) map cells, 7) overland flow units"));
+ G_message(_(" 1) acres, 2) meters sq., 3) miles sq., 4) hectares,"));
+ G_message(_(" 5) kilometers sq., 6) map cells, 7) overland flow units"));
fprintf(stderr, _("Choose 1-7 or 0 to exit this program: "));
G_gets(map_layer);
sscanf(map_layer, "%d", &i);
@@ -154,8 +125,7 @@
exit(EXIT_SUCCESS);
output->type_area = (char)i;
- G_message(_
- ("\nHow large an area (or how many overland flow units) must a drainage basin"));
+ G_message(_("\nHow large an area (or how many overland flow units) must a drainage basin"));
fprintf(stderr, _("be for it to be an exterior drainage basin: "));
G_gets(map_layer);
sscanf(map_layer, "%lf", &d);
@@ -206,8 +176,7 @@
(window->ns_res * window->ew_res), window);
break;
case 7: /* needs an overland flow map */
- G_message(_
- ("\nIf you hit <return> by itself for the next question, this"));
+ G_message(_("\nIf you hit <return> by itself for the next question, this"));
G_message(_("program will terminate."));
mapset = G_ask_old("What is the name of the overland flow map layer?",
map_layer, "cell", "cell");
@@ -319,13 +288,10 @@
prog_name);
G_message(_("%s to function (stream channels, overland flow aspect, and"),
G_program_name());
- G_message(_
- ("a display version of the accumulation map). %s also has the"),
+ G_message(_("a display version of the accumulation map). %s also has the"),
prog_name);
- G_message(_
- ("ability to generate several variables in the Revised Universal Soil Loss"));
- G_message(_
- ("Equation (Rusle): Slope Length (LS), and Slope Steepness (S).\n"));
+ G_message(_("ability to generate several variables in the Revised Universal Soil Loss"));
+ G_message(_("Equation (Rusle): Slope Length (LS), and Slope Steepness (S).\n"));
sprintf(buf, "Would you like any of these maps to be created?");
if (G_yes(buf, 1)) {
@@ -376,15 +342,11 @@
}
if (i) {
- G_message(_
- ("\nThe Slope Length factor (LS) and Slope Steepness (S) are influenced by"));
- G_message(_
- ("disturbed land. %s reflects this with an optional map layer or value"),
+ G_message(_("\nThe Slope Length factor (LS) and Slope Steepness (S) are influenced by"));
+ G_message(_("disturbed land. %s reflects this with an optional map layer or value"),
prog_name);
- G_message(_
- ("where the value indicates the percent of disturbed (barren) land in that cell."));
- G_message(_
- ("Type <return> if you do not have a disturbed land map layer."));
+ G_message(_("where the value indicates the percent of disturbed (barren) land in that cell."));
+ G_message(_("Type <return> if you do not have a disturbed land map layer."));
mapset = G_ask_old("", map_layer, "cell", "disturbed land");
if (mapset != NULL) {
@@ -396,8 +358,7 @@
NULL);
}
else {
- G_message(_
- ("\nType the value indicating the percent of disturbed land. This value will"));
+ G_message(_("\nType the value indicating the percent of disturbed land. This value will"));
G_message(_("be used for every cell in the current region."));
i = -6;
while (i < 0 || i > 100) {
@@ -412,18 +373,13 @@
}
/* 12345678901234567890123456789012345678901234567890123456789012345678901234567890 */
- G_message(_
- ("\nOverland surface flow only occurs for a set distance before swales form."));
- G_message(_
- ("Because of digital terrain model limitations, %s cannot pick up"),
+ G_message(_("\nOverland surface flow only occurs for a set distance before swales form."));
+ G_message(_("Because of digital terrain model limitations, %s cannot pick up"),
prog_name);
- G_message(_
- ("these swales. %s allows for an input (warning: kludge factor)"),
+ G_message(_("these swales. %s allows for an input (warning: kludge factor)"),
prog_name);
- G_message(_
- ("that prevents the surface flow distance from getting too long. Normally,"));
- G_message(_
- ("maximum slope length is around 600 feet (about 183 meters)."));
+ G_message(_("that prevents the surface flow distance from getting too long. Normally,"));
+ G_message(_("maximum slope length is around 600 feet (about 183 meters)."));
i = -1;
while (i < 0) {
@@ -438,13 +394,10 @@
com_add(&(input->com_line_seg), " ms=", i);
/* 12345678901234567890123456789012345678901234567890123456789012345678901234567890 */
- G_message(_
- ("\nRoads, ditches, changes in ground cover, and other factors will stop"));
- G_message(_
- ("slope length. You may input a raster map indicating the locations of these"));
+ G_message(_("\nRoads, ditches, changes in ground cover, and other factors will stop"));
+ G_message(_("slope length. You may input a raster map indicating the locations of these"));
G_message(_("blocking factors.\n"));
- G_message(_
- ("Hit <return> by itself for the next question if there is no blocking map."));
+ G_message(_("Hit <return> by itself for the next question if there is no blocking map."));
mapset = G_ask_old("What is the name of the blocking map layer?",
map_layer, "cell", "cell");
Modified: grass/branches/develbranch_6/raster/r.watershed/shed/intro.c
===================================================================
--- grass/branches/develbranch_6/raster/r.watershed/shed/intro.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.watershed/shed/intro.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -7,18 +7,15 @@
{
G_message(_("%s provides a text-based user-interface to the %s program."),
G_program_name(), NON_NAME);
- G_message(_
- ("%s also allows the user to prepare a report of map layers for each"),
+ G_message(_("%s also allows the user to prepare a report of map layers for each"),
G_program_name());
G_message(_("watershed basin determined in %s.\n"), NON_NAME);
- G_message(_
- ("%s will help the user determine which options to use for the"),
+ G_message(_("%s will help the user determine which options to use for the"),
G_program_name());
G_message(_("%s program. %s will then ask for map layers that will be"),
NON_NAME, G_program_name());
- G_message(_
- ("divided by basin. %s will then run %s and create the report."),
+ G_message(_("divided by basin. %s will then run %s and create the report."),
G_program_name(), NON_NAME);
return (0);
Modified: grass/branches/develbranch_6/raster/r.watershed/shed/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.watershed/shed/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/r.watershed/shed/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -37,8 +37,7 @@
if (input.fast) {
if (G_system(input.com_line_ram)) {
if (input.slow) {
- G_message(_
- ("Slow version of water analysis program starting now"));
+ G_message(_("Slow version of water analysis program starting now"));
if (G_system(input.com_line_seg)) {
free_input(&input);
Modified: grass/branches/develbranch_6/raster/simwe/r.sim.water/main.c
===================================================================
--- grass/branches/develbranch_6/raster/simwe/r.sim.water/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/simwe/r.sim.water/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -490,8 +490,7 @@
if ((depth == NULL) && (disch == NULL) && (err == NULL) &&
(outwalk == NULL))
- G_warning(_
- ("You are not outputting any raster or vector points maps"));
+ G_warning(_("You are not outputting any raster or vector points maps"));
ret_val = input_data();
if (ret_val != 1)
G_fatal_error(_("Input failed"));
Modified: grass/branches/develbranch_6/raster/simwe/simlib/input.c
===================================================================
--- grass/branches/develbranch_6/raster/simwe/simlib/input.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/simwe/simlib/input.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -408,8 +408,7 @@
cchez[row_rev][j] = (float)manin_val;
}
else {
- G_fatal_error(_
- ("Raster map <%s> not found, and manin_val undefined, choose one to be allowed to process"),
+ G_fatal_error(_("Raster map <%s> not found, and manin_val undefined, choose one to be allowed to process"),
manin);
}
if (detin != NULL) {
@@ -592,8 +591,7 @@
}
}
if (inf != NULL && smax < infmax)
- G_warning(_
- ("Infiltration exceeds the rainfall rate everywhere! No overland flow."));
+ G_warning(_("Infiltration exceeds the rainfall rate everywhere! No overland flow."));
cc = (double)mx *my;
@@ -619,8 +617,7 @@
fprintf(stderr, "\n");
G_message(_("Min elevation \t= %.2f m\nMax elevation \t= %.2f m\n"), zmin,
zmax);
- G_message(_
- ("Mean Source Rate (rainf. excess or sediment) \t= %f m/s or kg/m2s \n"),
+ G_message(_("Mean Source Rate (rainf. excess or sediment) \t= %f m/s or kg/m2s \n"),
si0);
G_message(_("Mean flow velocity \t= %f m/s\n"), vmean);
G_message(_("Mean Mannings \t= %f\n"), 1.0 / chmean);
Modified: grass/branches/develbranch_6/raster/wildfire/r.ros/main.c
===================================================================
--- grass/branches/develbranch_6/raster/wildfire/r.ros/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster/wildfire/r.ros/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -422,26 +422,22 @@
/*check if the output layer names EXIST */
if (G_find_cell2(name_base, G_mapset()))
- G_fatal_error(_
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),
name_base, G_mapset());
if (G_find_cell2(name_max, G_mapset()))
- G_fatal_error(_
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),
name_max, G_mapset());
if (G_find_cell2(name_maxdir, G_mapset()))
- G_fatal_error(_
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),
name_maxdir, G_mapset());
/*assign a name to output SPOTTING distance layer */
if (spotting) {
sprintf(name_spotdist, "%s.spotdist", parm.output->answer);
if (G_find_cell2(name_spotdist, G_mapset()))
- G_fatal_error(_
- ("Raster map <%s> already exists in mapset <%s>, select another name"),
+ G_fatal_error(_("Raster map <%s> already exists in mapset <%s>, select another name"),
name_spotdist, G_mapset());
}
Modified: grass/branches/develbranch_6/raster3d/base/r3.mask.main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/base/r3.mask.main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster3d/base/r3.mask.main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -156,8 +156,7 @@
if (G3d_maskFileExists())
- G_fatal_error(_
- ("Cannot create mask file: G3D_MASK already exists!\n Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."));
+ G_fatal_error(_("Cannot create mask file: G3D_MASK already exists!\n Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."));
setParams();
if (G_parser(argc, argv))
Modified: grass/branches/develbranch_6/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.cross.rast/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster3d/r3.cross.rast/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -296,8 +296,7 @@
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
G_message
- (_
- ("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
+ (_("The 2d and 3d region settings are different. I will use the g3d settings to adjust the 2d region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
Modified: grass/branches/develbranch_6/raster3d/r3.gwflow/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.gwflow/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster3d/r3.gwflow/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -190,14 +190,11 @@
solver = param.solver->answer;
if (strcmp(solver, N_SOLVER_DIRECT_LU) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct LU solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct LU solver do not work with sparse matrices"));
if (strcmp(solver, N_SOLVER_DIRECT_GAUSS) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct Gauss solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct Gauss solver do not work with sparse matrices"));
if (strcmp(solver, N_SOLVER_DIRECT_CHOLESKY) == 0 && param.sparse->answer)
- G_fatal_error(_
- ("The direct cholesky solver do not work with sparse matrices"));
+ G_fatal_error(_("The direct cholesky solver do not work with sparse matrices"));
@@ -299,8 +296,7 @@
N_solver_cholesky(les);
if (les == NULL)
- G_fatal_error(_
- ("Unable to create and solve the linear equation system"));
+ G_fatal_error(_("Unable to create and solve the linear equation system"));
/*write the result to the output file and copy the values to the data->phead array */
Modified: grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster3d/r3.in.ascii/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -188,8 +188,7 @@
for (x = 0; x < region->cols; x++) {
if (fscanf(fp, "%lf", &value) != 1) {
if (feof(fp))
- G_warning(_
- ("End of file reached while still loading data."));
+ G_warning(_("End of file reached while still loading data."));
G_debug(0,
"missing data at col=%d row=%d depth=%d last_value=[%.4f]",
x + 1, region->rows - y, z + 1, value);
Modified: grass/branches/develbranch_6/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.vtk/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster3d/r3.out.vtk/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -164,21 +164,18 @@
for (i = 0; i < 3; i++) {
if (param.vectormaps->answers[i] != NULL) {
if (NULL == G_find_grid3(param.vectormaps->answers[i], ""))
- G3d_fatalError(_
- ("Requested g3d vector map <%s> not found"),
+ G3d_fatalError(_("Requested g3d vector map <%s> not found"),
param.vectormaps->answers[i]);
}
else {
- G3d_fatalError(_
- ("Please provide three g3d vector maps [x,y,z]"));
+ G3d_fatalError(_("Please provide three g3d vector maps [x,y,z]"));
}
}
}
if (param.input->answers == NULL && param.rgbmaps->answers == NULL &&
param.vectormaps->answers == NULL) {
- G_warning(_
- ("No g3d data, RGB or xyz-vector maps are provided! Will only write the geometry."));
+ G_warning(_("No g3d data, RGB or xyz-vector maps are provided! Will only write the geometry."));
}
return;
@@ -451,8 +448,7 @@
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
- G_message(_
- ("The 2d and 3d region settings are different. The g3d settings are used to adjust the 2d region."));
+ G_message(_("The 2d and 3d region settings are different. The g3d settings are used to adjust the 2d region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
@@ -546,8 +542,7 @@
/* Close the 3d raster map */
if (!G3d_closeCell(in->map)) {
in->map = NULL;
- fatal_error(_
- ("Error closing 3d raster map, the VTK file may be incomplete."),
+ fatal_error(_("Error closing 3d raster map, the VTK file may be incomplete."),
in);
}
Modified: grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKData.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster3d/r3.out.vtk/writeVTKData.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -427,8 +427,7 @@
0.0);
/*Test of value range, the data should be 1 byte gray values */
if (value > 255 || value < 0) {
- G_warning(_
- ("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
+ G_warning(_("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
fprintf(fp, "0 ");
}
else {
@@ -461,8 +460,7 @@
0.0);
/*Test of value range, the data should be 1 byte gray values */
if (value > 255 || value < 0) {
- G_warning(_
- ("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
+ G_warning(_("Wrong 3d raster map values! Values should in between 0 and 255!\n"));
fprintf(fp, "0 ");
}
else {
Modified: grass/branches/develbranch_6/raster3d/r3.stats/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.stats/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster3d/r3.stats/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -603,8 +603,7 @@
/* break if the wrong number of subranges are given */
if (nsteps <= 0)
- G_fatal_error(_
- ("The number of subranges has to be equal or greater than 1"));
+ G_fatal_error(_("The number of subranges has to be equal or greater than 1"));
infile = inputfile->answer;
Modified: grass/branches/develbranch_6/raster3d/r3.to.rast/main.c
===================================================================
--- grass/branches/develbranch_6/raster3d/r3.to.rast/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/raster3d/r3.to.rast/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -310,8 +310,7 @@
G_message(_("Raster map %i Filename: %s"), i + 1, RasterFileName);
if (G_find_cell2(RasterFileName, ""))
- G_message(_
- ("Raster map %d Filename: %s already exists. Will be overwritten!"),
+ G_message(_("Raster map %d Filename: %s already exists. Will be overwritten!"),
i + 1, RasterFileName);
if (output_type == FCELL_TYPE)
Modified: grass/branches/develbranch_6/vector/lidar/v.lidar.correction/correction.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.lidar.correction/correction.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.lidar.correction/correction.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -81,13 +81,11 @@
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate_Correction
(interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*points->y < Overlap.S)) { /*(1) */
@@ -98,8 +96,7 @@
if (Insert_Correction
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
else { /*(1) */
@@ -108,8 +105,7 @@
if (Insert_Correction
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
}
else if ((*points->x < Overlap.W)) {
@@ -121,8 +117,7 @@
interpolation *= weight;
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
Vect_cat_get(cats, F_CLASSIFICATION, &class);
class =
@@ -144,13 +139,11 @@
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate_Correction
(interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else { /*(2) */
weight = (Overlap.W - *points->x) / overlap;
@@ -158,8 +151,7 @@
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
Vect_cat_get(cats, F_CLASSIFICATION, &class);
class =
@@ -182,8 +174,7 @@
if (Select_Correction
(&interpolation, line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
Vect_cat_get(cats, F_CLASSIFICATION, &class);
class =
@@ -203,8 +194,7 @@
if (Insert_Correction
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
}
}
Modified: grass/branches/develbranch_6/vector/lidar/v.lidar.correction/main.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.lidar.correction/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.lidar.correction/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -174,8 +174,7 @@
/* Start driver and open db */
driver = db_start_driver_open_database(dvr, db);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. Run db.connect."),
+ G_fatal_error(_("No database connection for driver <%s> is defined. Run db.connect."),
dvr);
/* Setting regions and boxes */
Modified: grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/edgedetection.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/edgedetection.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/edgedetection.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -237,14 +237,12 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate
(gradient[0], gradient[1], interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*point->y < Overlap.S) && (*point->y != General.S)) { /*(1) */
@@ -256,8 +254,7 @@
(gradient[0] * weight, gradient[1] * weight,
interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) { /*(1) */
@@ -267,8 +264,7 @@
(gradient[0] * weight, gradient[1] * weight,
interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
}
@@ -286,8 +282,7 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
edge =
@@ -318,14 +313,12 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate
(gradient[0], gradient[1], interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) { /*(2) */
@@ -338,8 +331,7 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
edge =
@@ -370,8 +362,7 @@
if (Select
(&gradient[0], &gradient[1], &interpolation,
line_num[i], driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
edge =
@@ -396,8 +387,7 @@
(gradient[0] * weight, gradient[1] * weight,
interpolation * weight, line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
} /*else (1) */
} /*else */
Modified: grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/main.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.lidar.edgedetection/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -187,13 +187,11 @@
/* Start driver and open db */
driver = db_start_driver_open_database(dvr, db);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. Run db.connect."),
+ G_fatal_error(_("No database connection for driver <%s> is defined. Run db.connect."),
dvr);
if (Create_Interpolation_Table(out_opt->answer, driver) != DB_OK)
- G_fatal_error(_
- ("It was impossible to create <%s> interpolation table in database."),
+ G_fatal_error(_("It was impossible to create <%s> interpolation table in database."),
out_opt->answer);
/* Setting regions and boxes */
Modified: grass/branches/develbranch_6/vector/lidar/v.lidar.growing/main.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.lidar.growing/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.lidar.growing/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -148,8 +148,7 @@
driver = db_start_driver_open_database(field->driver, field->database);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. Run db.connect."),
+ G_fatal_error(_("No database connection for driver <%s> is defined. Run db.connect."),
field->driver);
/* Setting regions and boxes */
Modified: grass/branches/develbranch_6/vector/lidar/v.outlier/main.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.outlier/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.outlier/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -164,8 +164,7 @@
Vect_set_open_level(1);
/* Open input vector */
if (1 > Vect_open_old(&In, in_opt->answer, mapset))
- G_fatal_error(_
- ("Unable to open vector map <%s> at the topological level"),
+ G_fatal_error(_("Unable to open vector map <%s> at the topological level"),
in_opt->answer);
/* Copy vector Head File */
@@ -186,8 +185,7 @@
/* Start driver and open db */
driver = db_start_driver_open_database(dvr, db);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. Run db.connect."),
+ G_fatal_error(_("No database connection for driver <%s> is defined. Run db.connect."),
dvr);
/* Setting regions and boxes */
@@ -317,8 +315,7 @@
"Creating auxiliar table for archiving overlaping zones");
if ((flag_auxiliar =
P_Create_Aux_Table(driver, table_name)) == FALSE)
- G_fatal_error(_
- ("It was impossible to create <Auxiliar_outlier_table>."));
+ G_fatal_error(_("It was impossible to create <Auxiliar_outlier_table>."));
}
if (qgis_opt->answer)
Modified: grass/branches/develbranch_6/vector/lidar/v.outlier/outlier.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.outlier/outlier.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.outlier/outlier.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -70,13 +70,11 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate_Outlier(gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*point->y < Overlap.S) && (*point->y != General.S)) { /*(1) */
@@ -87,8 +85,7 @@
if (Insert_Outlier
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) { /*(1) */
@@ -97,8 +94,7 @@
if (Insert_Outlier
(interpolation * weight, line_num[i],
driver) != DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
}
}
@@ -115,8 +111,7 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
@@ -143,13 +138,11 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
if (UpDate_Outlier(gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to update the database"));
+ G_fatal_error(_("Impossible to update the database"));
}
else if ((*point->y <= Overlap.N) && (*point->y >= Overlap.S)) { /*(2) */
@@ -161,8 +154,7 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
@@ -189,8 +181,7 @@
if (Select_Outlier(&gradient[0], line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to read the database"));
+ G_fatal_error(_("Impossible to read the database"));
residual = *point->z - interpolation;
@@ -212,8 +203,7 @@
if (Insert_Outlier
(interpolation * weight, line_num[i], driver)
!= DB_OK)
- G_fatal_error(_
- ("Impossible to write in the database"));
+ G_fatal_error(_("Impossible to write in the database"));
} /*else (1) */
} /*else */
Modified: grass/branches/develbranch_6/vector/lidar/v.surf.bspline/crosscorr.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.surf.bspline/crosscorr.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.surf.bspline/crosscorr.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -117,8 +117,7 @@
Fi->database);
if (driver_cats == NULL)
- G_fatal_error(_
- ("CrossCorrelation: Cannot open database %s by driver %s"),
+ G_fatal_error(_("CrossCorrelation: Cannot open database %s by driver %s"),
Fi->database, Fi->driver);
nrec =
@@ -128,12 +127,10 @@
ctype = cvarr.ctype;
if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("CrossCorrelation: Column type not supported"));
+ G_fatal_error(_("CrossCorrelation: Column type not supported"));
if (nrec < 0)
- G_fatal_error(_
- ("CrossCorrelation: Cannot select data from table"));
+ G_fatal_error(_("CrossCorrelation: Cannot select data from table"));
G_message(_("CrossCorrelation: %d records selected from table"),
nrec);
@@ -216,8 +213,7 @@
obs_mean[i] = dval;
}
if (ret != DB_OK) {
- G_warning(_
- ("CrossCorrelation: No record for point (cat = %d)"),
+ G_warning(_("CrossCorrelation: No record for point (cat = %d)"),
cat);
continue;
}
@@ -333,8 +329,7 @@
G_free_vector(rms);
} /* ENDIF (ndata > 0) */
else
- G_warning(_
- ("CrossCorrelation: No point lies into the current region"));
+ G_warning(_("CrossCorrelation: No point lies into the current region"));
G_free(observ);
return TRUE;
Modified: grass/branches/develbranch_6/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/branches/develbranch_6/vector/lidar/v.surf.bspline/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/lidar/v.surf.bspline/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -201,8 +201,7 @@
driver = db_start_driver_open_database(dvr, db);
if (driver == NULL)
- G_fatal_error(_
- ("No database connection for driver <%s> is defined. "
+ G_fatal_error(_("No database connection for driver <%s> is defined. "
"Run db.connect."), dvr);
db_init_string(&sql);
@@ -229,8 +228,7 @@
Vect_set_open_level(1); /* WITHOUT TOPOLOGY */
if (1 > Vect_open_old(&In, in_opt->answer, mapset))
- G_fatal_error(_
- ("Unable to open vector map <%s> at the topological level"),
+ G_fatal_error(_("Unable to open vector map <%s> at the topological level"),
in_opt->answer);
/* Open input ext vector */
@@ -250,8 +248,7 @@
Vect_set_open_level(1); /* WITHOUT TOPOLOGY */
if (1 > Vect_open_old(&In_ext, in_ext_opt->answer, mapset))
- G_fatal_error(_
- ("Unable to open vector map <%s> at the topological level"),
+ G_fatal_error(_("Unable to open vector map <%s> at the topological level"),
in_opt->answer);
}
@@ -259,8 +256,7 @@
/* vector output */
if (vector && !map) {
if (strcmp(dvr, "dbf") == 0)
- G_fatal_error(_
- ("Sorry, <%s> driver is not allowed for vector output in this module. "
+ G_fatal_error(_("Sorry, <%s> driver is not allowed for vector output in this module. "
"Try with a raster output or other driver."), dvr);
Vect_check_input_output_name(in_opt->answer, out_opt->answer,
@@ -382,8 +378,7 @@
nrows_ncols = (double)nrows *ncols;
if ((nrows_ncols) > 30000000) /* about 5500x5500 cells */
- G_fatal_error(_
- ("Interpolation: The region resolution is too high: %d cells. "
+ G_fatal_error(_("Interpolation: The region resolution is too high: %d cells. "
"Consider to change it."), nrows_ncols);
/*raster_matrix = G_alloc_fmatrix (nrows, ncols); Is it neccesary a double precision?? */
@@ -545,8 +540,7 @@
obs_mean[i] = dval;
}
if (ret != DB_OK) {
- G_warning(_
- ("Interpolation: (%d,%d): No record for point (cat = %d)"),
+ G_warning(_("Interpolation: (%d,%d): No record for point (cat = %d)"),
subregion_row, subregion_col, cat);
continue;
}
Modified: grass/branches/develbranch_6/vector/v.buffer/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.buffer/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.buffer/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -452,8 +452,7 @@
db_CatValArray_get_value_int(&cvarr, cat,
&size_val_int);
if (ret != DB_OK) {
- G_warning(_
- ("No record for category %d in table <%s>"),
+ G_warning(_("No record for category %d in table <%s>"),
cat, Fi->table);
continue;
}
@@ -465,16 +464,14 @@
db_CatValArray_get_value_double(&cvarr, cat,
&size_val);
if (ret != DB_OK) {
- G_warning(_
- ("No record for category %d in table <%s>"),
+ G_warning(_("No record for category %d in table <%s>"),
cat, Fi->table);
continue;
}
}
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;
}
@@ -493,8 +490,7 @@
G_debug(2, "Minimum tolerance = %f", dtmp);
if (tolerance > dtmp) {
tolerance = dtmp;
- G_warning(_
- ("The tolerance was reset to %g (map units). [category %d]"),
+ G_warning(_("The tolerance was reset to %g (map units). [category %d]"),
tolerance, cat);
}
}
@@ -533,8 +529,7 @@
db_CatValArray_get_value_int(&cvarr, cat,
&size_val_int);
if (ret != DB_OK) {
- G_warning(_
- ("No record for category %d in table <%s>"),
+ G_warning(_("No record for category %d in table <%s>"),
cat, Fi->table);
continue;
}
@@ -546,16 +541,14 @@
db_CatValArray_get_value_double(&cvarr, cat,
&size_val);
if (ret != DB_OK) {
- G_warning(_
- ("No record for category %d in table <%s>"),
+ G_warning(_("No record for category %d in table <%s>"),
cat, Fi->table);
continue;
}
}
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;
}
@@ -574,8 +567,7 @@
G_debug(2, "Minimum tolerance = %f", dtmp);
if (tolerance > dtmp) {
tolerance = dtmp;
- G_warning(_
- ("The tolerance was reset to %g (map units). [category %d]"),
+ G_warning(_("The tolerance was reset to %g (map units). [category %d]"),
tolerance, cat);
}
}
Modified: grass/branches/develbranch_6/vector/v.build/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.build/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.build/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -82,8 +82,7 @@
if (build) {
/* open input vector */
if (G_find_vector2(map_opt->answer, G_mapset()) == NULL)
- G_fatal_error(_
- ("Vector map <%s> not found in the current mapset"),
+ G_fatal_error(_("Vector map <%s> not found in the current mapset"),
map_opt->answer);
Vect_set_open_level(1);
Modified: grass/branches/develbranch_6/vector/v.category/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.category/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.category/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -130,8 +130,7 @@
break;
case ('c'):
option = O_CHFIELD;
- G_warning(_
- ("Database connection and attribute tables for concerned layers are not changed"));
+ G_warning(_("Database connection and attribute tables for concerned layers are not changed"));
break;
case ('s'):
option = O_SUM;
Modified: grass/branches/develbranch_6/vector/v.clean/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.clean/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.clean/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -368,8 +368,7 @@
G_message(_("%d modifications done"), count);
break;
case TOOL_RMLINE:
- G_message(_
- ("Tool: Remove all lines and boundaries of zero length"));
+ G_message(_("Tool: Remove all lines and boundaries of zero length"));
count = remove_zero_line(&Out, otype, pErr);
G_message(_("%d lines / boundaries removed"), count);
break;
@@ -379,8 +378,7 @@
}
if (!no_build_flag->answer) {
- G_important_message(_
- ("Rebuilding topology for output vector map..."));
+ G_important_message(_("Rebuilding topology for output vector map..."));
Vect_build_partial(&Out, GV_BUILD_NONE, NULL);
Vect_build(&Out, output);
}
Modified: grass/branches/develbranch_6/vector/v.clean/prune.c
===================================================================
--- grass/branches/develbranch_6/vector/v.clean/prune.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.clean/prune.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -217,13 +217,11 @@
fflush(stderr);
}
- G_important_message(_
- ("\n%d vertices from input %d (vertices of given type) removed, i.e. %.2f %%"),
+ G_important_message(_("\n%d vertices from input %d (vertices of given type) removed, i.e. %.2f %%"),
nremoved, nvertices, 100.0 * nremoved / nvertices);
if (not_pruned_lines > 0)
- G_message(_
- ("%d boundaries not pruned because pruning would damage topology"),
+ G_message(_("%d boundaries not pruned because pruning would damage topology"),
not_pruned_lines);
Vect_destroy_line_struct(Points);
Modified: grass/branches/develbranch_6/vector/v.convert/att.c
===================================================================
--- grass/branches/develbranch_6/vector/v.convert/att.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.convert/att.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -33,8 +33,7 @@
/* Find dig_cats if exists */
if (NULL == G_find_file("dig_cats", in, mapset)) {
- G_message(_
- ("No category labels (dig_cats) found, no table created.\n"));
+ G_message(_("No category labels (dig_cats) found, no table created.\n"));
return 0;
}
Modified: grass/branches/develbranch_6/vector/v.convert/old2new.c
===================================================================
--- grass/branches/develbranch_6/vector/v.convert/old2new.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.convert/old2new.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -86,14 +86,12 @@
}
}
if (sline == -1) {
- G_warning(_
- ("Failed to attach an attribute (category %d) to a line."),
+ G_warning(_("Failed to attach an attribute (category %d) to a line."),
cats[i].cat);
}
else {
if (lines[sline].cat > -1) {
- G_warning(_
- ("Line %d label: %d matched another label: %d."),
+ G_warning(_("Line %d label: %d matched another label: %d."),
sline, lines[sline].cat, cats[i].cat);
}
lines[sline].cat = cats[i].cat;
Modified: grass/branches/develbranch_6/vector/v.db.connect/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.db.connect/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.db.connect/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -132,16 +132,14 @@
Vect_open_old(&Map, inopt->answer, mapset);
else {
if (Vect_open_update_head(&Map, inopt->answer, G_mapset()) < 1)
- G_fatal_error(_
- ("Unable to modify vector map stored in other mapset"));
+ G_fatal_error(_("Unable to modify vector map stored in other mapset"));
Vect_hist_command(&Map);
}
if (print->answer || shell_print->answer || columns->answer) {
num_dblinks = Vect_get_num_dblinks(&Map);
if (num_dblinks <= 0)
- G_fatal_error(_
- ("Database connection for map <%s> is not defined in DB file"),
+ G_fatal_error(_("Database connection for map <%s> is not defined in DB file"),
G_fully_qualified_name(input, mapset));
else { /* num_dblinks > 0 */
@@ -178,8 +176,7 @@
else { /* columns */
if ((fi = Vect_get_field(&Map, field)) == NULL)
- G_fatal_error(_
- ("Database connection not defined for layer %d"),
+ G_fatal_error(_("Database connection not defined for layer %d"),
field);
driver = db_start_driver(fi->driver);
if (driver == NULL)
@@ -189,8 +186,7 @@
db_init_handle(&handle);
db_set_handle(&handle, fi->database, NULL);
if (db_open_database(driver, &handle) != DB_OK)
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi->database, fi->driver);
db_init_string(&table_name);
db_set_string(&table_name, fi->table);
@@ -241,8 +237,7 @@
if (db_table_exists
(dbdriver->answer, dbdatabase->answer,
dbtable->answer) < 1)
- G_fatal_error(_
- ("Table <%s> does not exist in database <%s>"),
+ G_fatal_error(_("Table <%s> does not exist in database <%s>"),
dbtable->answer,
dbdatabase->answer);
@@ -257,23 +252,20 @@
db_get_column(driver, dbtable->answer, dbkey->answer,
&column);
if (!column)
- G_fatal_error(_
- ("Missing column <%s> in table <%s>"),
+ G_fatal_error(_("Missing column <%s> in table <%s>"),
dbkey->answer, dbtable->answer);
if (db_column_Ctype
(driver, dbtable->answer,
dbkey->answer) != DB_C_TYPE_INT)
- G_fatal_error(_
- ("Data type of key column must be integer"));
+ G_fatal_error(_("Data type of key column must be integer"));
ret = Vect_map_del_dblink(&Map, field);
if (Vect_map_add_dblink(&Map, field,
fi->name, fi->table, fi->key,
fi->database,
fi->driver) == 0) {
- G_important_message(_
- ("The table <%s> is now part of vector map <%s> "
+ G_important_message(_("The table <%s> is now part of vector map <%s> "
"and may be deleted "
"or overwritten by GRASS modules"),
dbtable->answer, input);
@@ -285,15 +277,13 @@
if (db_table_exists
(dbdriver->answer, dbdatabase->answer,
dbtable->answer) < 1)
- G_warning(_
- ("Table <%s> does not exist in database <%s>"),
+ G_warning(_("Table <%s> does not exist in database <%s>"),
dbtable->answer, dbdatabase->answer);
if (Vect_map_add_dblink(&Map, field,
fi->name, fi->table, fi->key,
fi->database, fi->driver) == 0) {
- G_important_message(_
- ("The table <%s> is now part of vector map <%s> "
+ G_important_message(_("The table <%s> is now part of vector map <%s> "
"and may be deleted "
"or overwritten by GRASS modules"),
dbtable->answer, input);
@@ -304,8 +294,7 @@
&Map));
if (!driver)
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi->database, fi->driver);
if (db_create_index2(driver, fi->table, fi->key) !=
@@ -315,12 +304,10 @@
if (db_grant_on_table
(driver, fi->table, DB_PRIV_SELECT,
DB_GROUP | DB_PUBLIC) != DB_OK)
- G_warning(_
- ("Cannot grant privileges on table %s"),
+ G_warning(_("Cannot grant privileges on table %s"),
fi->table);
- G_important_message(_
- ("Select privileges were granted on the table"));
+ G_important_message(_("Select privileges were granted on the table"));
db_close_database_shutdown_driver(driver);
}
Modified: grass/branches/develbranch_6/vector/v.digit/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.digit/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.digit/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -155,8 +155,7 @@
Vect_open_update(&Map, map_opt->answer, G_mapset());
}
else {
- G_fatal_error(_
- ("Map <%s> does not exist in current mapset. Add flag -n to create a new map."),
+ G_fatal_error(_("Map <%s> does not exist in current mapset. Add flag -n to create a new map."),
map_opt->answer);
}
}
Modified: grass/branches/develbranch_6/vector/v.distance/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.distance/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.distance/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -294,8 +294,7 @@
G_fatal_error(_("Vector map <%s> not found"), from_opt->answer);
if (!print_flag->answer && strcmp(mapset, G_mapset()) != 0)
- G_fatal_error(_
- ("Vector map <%s> is not in user mapset and cannot be updated"),
+ G_fatal_error(_("Vector map <%s> is not in user mapset and cannot be updated"),
from_opt->answer);
Vect_set_open_level(2);
@@ -348,14 +347,12 @@
if (!all) {
Fi = Vect_get_field(&From, from_field);
if (Fi == NULL)
- G_fatal_error(_
- ("Database connection not defined for layer %d"),
+ G_fatal_error(_("Database connection not defined for layer %d"),
from_field);
driver = db_start_driver_open_database(Fi->driver, Fi->database);
if (driver == NULL)
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Fi->database, Fi->driver);
/* check if column exists */
@@ -709,8 +706,7 @@
for (j = 0; j < TCats->n_cats; j++) {
if (TCats->field[j] == to_field) {
if (tmp_tcat >= 0)
- G_warning(_
- ("More cats found in to_layer (area=%d)"),
+ G_warning(_("More cats found in to_layer (area=%d)"),
area);
tmp_tcat = TCats->cat[j];
}
@@ -851,8 +847,7 @@
G_debug(3, "selected values = %d", nrec);
if (cvarr.ctype == DB_C_TYPE_DATETIME) {
- G_warning(_
- ("DATETIME type not yet supported, no attributes will be uploaded"));
+ G_warning(_("DATETIME type not yet supported, no attributes will be uploaded"));
}
db_close_database_shutdown_driver(to_driver);
}
@@ -1119,8 +1114,7 @@
G_message(_("%d categories exist in the table"), ncatexist);
G_message(_("%d categories read from the map exist in the table"),
update_exist);
- G_message(_
- ("%d categories read from the map don't exist in the table"),
+ G_message(_("%d categories read from the map don't exist in the table"),
update_notexist);
G_message(_("%d records updated"), update_ok);
G_message(_("%d update errors"), update_err);
Modified: grass/branches/develbranch_6/vector/v.drape/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.drape/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.drape/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -153,15 +153,13 @@
if (in_bbox.W < region_bbox.W ||
in_bbox.E > region_bbox.E ||
in_bbox.S < region_bbox.S || in_bbox.N > region_bbox.N) {
- G_warning(_
- ("Current region does not include the entire input vector map <%s>"),
+ G_warning(_("Current region does not include the entire input vector map <%s>"),
in_opt->answer);
}
if (in_bbox.W < rast_bbox.W ||
in_bbox.E > rast_bbox.E ||
in_bbox.S < rast_bbox.S || in_bbox.N > rast_bbox.N) {
- G_warning(_
- ("Elevation raster map <%s> does not cover the entire area "
+ G_warning(_("Elevation raster map <%s> does not cover the entire area "
"of the input vector map <%s>. "), rast_opt->answer,
in_opt->answer);
}
Modified: grass/branches/develbranch_6/vector/v.edit/a2b.c
===================================================================
--- grass/branches/develbranch_6/vector/v.edit/a2b.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.edit/a2b.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -133,8 +133,7 @@
/* Collect the points */
for (i = 0; i < n_coors; i++) {
if (G_getl2(buff, BUFFSIZE - 1, ascii) == 0) {
- G_warning(_
- ("End of ASCII file reached before end of coordinates"));
+ G_warning(_("End of ASCII file reached before end of coordinates"));
return -1;
}
if (buff[0] == '\0') {
@@ -176,8 +175,7 @@
/* Collect the cats */
for (i = 0; i < n_cats; i++) {
if (G_getl2(buff, BUFFSIZE - 1, ascii) == 0) {
- G_warning(_
- ("End of ascii file reached before end of categories"));
+ G_warning(_("End of ascii file reached before end of categories"));
return -1;
}
if (buff[0] == '\0') {
Modified: grass/branches/develbranch_6/vector/v.edit/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.edit/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.edit/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -111,8 +111,7 @@
else { /* open selected vector file */
mapset = G_find_vector2(params.map->answer, G_mapset());
if (mapset == NULL) {
- G_fatal_error(_
- ("Vector map <%s> not found in the current mapset"),
+ G_fatal_error(_("Vector map <%s> not found in the current mapset"),
params.map->answer);
}
else if (action_mode == MODE_ADD) { /* write */
@@ -123,8 +122,7 @@
}
if (ret < 2)
- G_fatal_error(_
- ("Unable to open vector map <%s> at topological level %d"),
+ G_fatal_error(_("Unable to open vector map <%s> at topological level %d"),
params.map->answer, 2);
}
@@ -147,8 +145,7 @@
((const char *)params.map->answer, (const char *)G_mapset()),
G_fully_qualified_name((const char *)bmap,
(const char *)mapset)) == 0) {
- G_fatal_error(_
- ("Unable to open vector map <%s> as the backround map. "
+ G_fatal_error(_("Unable to open vector map <%s> as the backround map. "
"It is given as vector map to be edited."),
bmap);
}
@@ -222,8 +219,7 @@
/* reopen the map for updating */
if (action_mode == MODE_ZBULK && !Vect_is_3d(&Map)) {
Vect_close(&Map);
- G_fatal_error(_
- ("Vector map <%s> is not 3D. Tool '%s' requires 3D vector map. "
+ G_fatal_error(_("Vector map <%s> is not 3D. Tool '%s' requires 3D vector map. "
"Please convert the vector map "
"to 3D using e.g. %s."), params.map->answer,
params.tool->answer, "v.extrude");
Modified: grass/branches/develbranch_6/vector/v.generalize/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.generalize/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.generalize/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -321,8 +321,7 @@
if (layer < 1)
G_fatal_error(_("'%s' must be > 0 for '%s'"), "layer", "where");
if (cat_opt->answer)
- G_warning(_
- ("'where' and 'cats' parameters were supplied, cat will be ignored"));
+ G_warning(_("'where' and 'cats' parameters were supplied, cat will be ignored"));
chcat = 1;
varray = Vect_new_varray(Vect_get_num_lines(&In));
if (Vect_set_varray_from_db
Modified: grass/branches/develbranch_6/vector/v.hull/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.hull/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.hull/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -329,8 +329,7 @@
G_fatal_error(_("Error loading vector points map <%s>"), sitefile);
if (numSitePoints < 3)
- G_fatal_error(_
- ("Convex hull calculation requires at least three points"));
+ G_fatal_error(_("Convex hull calculation requires at least three points"));
/* create a 2D or a 3D hull? */
Modified: grass/branches/develbranch_6/vector/v.in.ascii/a2b.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ascii/a2b.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.in.ascii/a2b.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -99,8 +99,7 @@
/* Collect the points */
for (i = 0; i < n_coors; i++) {
if (G_getl2(buff, BUFFSIZE - 1, ascii) == 0)
- G_fatal_error(_
- ("End of ASCII file reached before end of coordinates"));
+ G_fatal_error(_("End of ASCII file reached before end of coordinates"));
if (buff[0] == '\0') {
G_debug(3, "a2b: skipping blank line while reading vertices");
@@ -141,8 +140,7 @@
/* Collect the cats */
for (i = 0; i < n_cats; i++) {
if (G_getl2(buff, BUFFSIZE - 1, ascii) == 0)
- G_fatal_error(_
- ("End of ASCII file reached before end of categories"));
+ G_fatal_error(_("End of ASCII file reached before end of categories"));
if (buff[0] == '\0') {
G_debug(3,
Modified: grass/branches/develbranch_6/vector/v.in.ascii/in.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ascii/in.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.in.ascii/in.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -259,13 +259,11 @@
/* check column numbers */
if (xcol >= minncols) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("x column number > minimum last column number\n(incorrect field separator?)"));
+ G_fatal_error(_("x column number > minimum last column number\n(incorrect field separator?)"));
}
if (ycol >= minncols) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("y column number > minimum last column number\n(incorrect field separator?)"));
+ G_fatal_error(_("y column number > minimum last column number\n(incorrect field separator?)"));
}
if (zcol >= minncols) {
Vect_delete(new->answer);
@@ -315,8 +313,7 @@
&Map));
if (driver == NULL) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Vect_subst_var(Fi->database, &Map), Fi->driver);
}
db_begin_transaction(driver);
@@ -335,8 +332,7 @@
}
if (catcol == i && coltype[i] != DB_C_TYPE_INT) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Category column is not of integer type"));
+ G_fatal_error(_("Category column is not of integer type"));
}
switch (coltype[i]) {
@@ -417,8 +413,7 @@
if ((catcol >= 0 && nc != ncols) ||
(catcol < 0 && (nc - 1) != ncols)) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Number of columns defined (%d) does not match number "
+ G_fatal_error(_("Number of columns defined (%d) does not match number "
"of columns (%d) in input"),
catcol < 0 ? nc - 1 : nc, ncols);
}
@@ -446,14 +441,12 @@
switch (coltype[i]) {
case DB_C_TYPE_INT:
if (ctype == DB_C_TYPE_DOUBLE) {
- G_warning(_
- ("Column number %d <%s> defined as double "
+ G_warning(_("Column number %d <%s> defined as double "
"has only integer values"), i + 1,
db_get_column_name(column));
}
else if (ctype == DB_C_TYPE_STRING) {
- G_warning(_
- ("Column number %d <%s> defined as string "
+ G_warning(_("Column number %d <%s> defined as string "
"has only integer values"), i + 1,
db_get_column_name(column));
}
@@ -461,14 +454,12 @@
case DB_C_TYPE_DOUBLE:
if (ctype == DB_C_TYPE_INT) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Column number %d <%s> defined as integer "
+ G_fatal_error(_("Column number %d <%s> defined as integer "
"has double values"), i + 1,
db_get_column_name(column));
}
else if (ctype == DB_C_TYPE_STRING) {
- G_warning(_
- ("Column number %d <%s> defined as string "
+ G_warning(_("Column number %d <%s> defined as string "
"has double values"), i + 1,
db_get_column_name(column));
}
@@ -476,22 +467,19 @@
case DB_C_TYPE_STRING:
if (ctype == DB_C_TYPE_INT) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Column number %d <%s> defined as integer "
+ G_fatal_error(_("Column number %d <%s> defined as integer "
"has string values"), i + 1,
db_get_column_name(column));
}
else if (ctype == DB_C_TYPE_DOUBLE) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Column number %d <%s> defined as double "
+ G_fatal_error(_("Column number %d <%s> defined as double "
"has string values"), i + 1,
db_get_column_name(column));
}
if (length < collen[i]) {
Vect_delete(new->answer);
- G_fatal_error(_
- ("Length of column %d <%s> (%d) is less than "
+ G_fatal_error(_("Length of column %d <%s> (%d) is less than "
"maximum value " "length (%d)"),
i + 1, db_get_column_name(column),
length, collen[i]);
@@ -513,8 +501,7 @@
}
if (db_create_index2(driver, Fi->table, key) != DB_OK)
- G_warning(_
- ("Unable to create index for table <%s>, key <%s>"),
+ G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fi->table, key);
Vect_map_del_dblink(&Map, 1);
Modified: grass/branches/develbranch_6/vector/v.in.ascii/points.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ascii/points.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.in.ascii/points.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -162,8 +162,7 @@
}
else {
fprintf(stderr, "Current row: '%s'\n", buf_raw);
- G_fatal_error(_
- ("Unparsable longitude value in column <%d>: %s"),
+ G_fatal_error(_("Unparsable longitude value in column <%d>: %s"),
i, tokens[i]);
}
}
@@ -182,8 +181,7 @@
}
else {
fprintf(stderr, "Current row: '%s'\n", buf_raw);
- G_fatal_error(_
- ("Unparsable latitude value in column <%d>: %s"),
+ G_fatal_error(_("Unparsable latitude value in column <%d>: %s"),
i, tokens[i]);
}
}
@@ -260,8 +258,7 @@
G_free(tmp_token);
if (region_flag)
- G_message(_
- ("Skipping %d of %d rows falling outside of current region"),
+ G_message(_("Skipping %d of %d rows falling outside of current region"),
skipped, row - 1);
return 0;
Modified: grass/branches/develbranch_6/vector/v.in.db/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.db/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.in.db/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -127,8 +127,7 @@
if (db_table_exists(db_get_default_driver_name(),
db_get_default_database_name(), outvect->answer) == 1)
- G_fatal_error(_
- ("Output vector map, table <%s> (driver: <%s>, database: <%s>) "
+ G_fatal_error(_("Output vector map, table <%s> (driver: <%s>, database: <%s>) "
"already exists"), outvect->answer,
db_get_default_driver_name(),
db_get_default_database_name());
Modified: grass/branches/develbranch_6/vector/v.in.ogr/geom.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ogr/geom.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.in.ogr/geom.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -317,8 +317,7 @@
Vect_write_line(Map, otype, Points, Cats);
}
else { /* 0 points */
- G_warning(_
- ("No centroid written for polygon with 0 vertices"));
+ G_warning(_("No centroid written for polygon with 0 vertices"));
}
}
Modified: grass/branches/develbranch_6/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ogr/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.in.ogr/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -332,8 +332,7 @@
if (!outloc_opt->answer) { /* Check if the map exists */
if (G_find_vector2(out_opt->answer, G_mapset())) {
if (overwrite)
- G_warning(_
- ("Vector map <%s> already exists and will be overwritten"),
+ G_warning(_("Vector map <%s> already exists and will be overwritten"),
out_opt->answer);
else
G_fatal_error(_("Vector map <%s> already exists"),
@@ -377,8 +376,7 @@
if (region_flag->answer) {
if (spat_opt->answer)
- G_fatal_error(_
- ("Select either the current region flag or the spatial option, not both"));
+ G_fatal_error(_("Select either the current region flag or the spatial option, not both"));
G_get_window(&cur_wind);
xmin = cur_wind.west;
@@ -485,8 +483,7 @@
/* Projection only required for checking so convert non-interactively */
if (GPJ_osr_to_grass(&cellhd, &proj_info,
&proj_units, Ogr_projection, 0) < 0)
- G_warning(_
- ("Unable to convert input map projection information to "
+ G_warning(_("Unable to convert input map projection information to "
"GRASS format for checking"));
/* Does the projection of the current location match the dataset? */
@@ -709,8 +706,7 @@
/* hack: treat as string */
sprintf(buf, ", %s varchar ( %d )", Ogr_fieldname,
OFTIntegerListlength);
- G_warning(_
- ("Writing column <%s> with fixed length %d chars (may be truncated)"),
+ G_warning(_("Writing column <%s> with fixed length %d chars (may be truncated)"),
Ogr_fieldname, OFTIntegerListlength);
}
else if (Ogr_ftype == OFTReal) {
@@ -733,8 +729,7 @@
fwidth = OGR_Fld_GetWidth(Ogr_field);
/* TODO: read all records first and find the longest string length */
if (fwidth == 0) {
- G_warning(_
- ("Width for column %s set to 255 (was not specified by OGR), "
+ G_warning(_("Width for column %s set to 255 (was not specified by OGR), "
"some strings may be truncated!"),
Ogr_fieldname);
fwidth = 255;
@@ -746,8 +741,7 @@
/* hack: treat as string */
sprintf(buf, ", %s varchar ( %d )", Ogr_fieldname,
OFTIntegerListlength);
- G_warning(_
- ("Writing column %s with fixed length %d chars (may be truncated)"),
+ G_warning(_("Writing column %s with fixed length %d chars (may be truncated)"),
Ogr_fieldname, OFTIntegerListlength);
}
else {
@@ -1075,8 +1069,7 @@
G_message("%s", separator);
if (n_overlaps > 0) {
- G_warning(_
- ("%d areas represent more (overlapping) features, because polygons overlap "
+ G_warning(_("%d areas represent more (overlapping) features, because polygons overlap "
"in input layer(s). Such areas are linked to more than 1 row in attribute table. "
"The number of features for those areas is stored as category in layer %d"),
n_overlaps, nlayers + 1);
@@ -1131,8 +1124,7 @@
}
if (with_z && !z_flag->answer)
- G_warning(_
- ("Input data contains 3D features. Created vector is 2D only, "
+ G_warning(_("Input data contains 3D features. Created vector is 2D only, "
"use -z flag to import 3D vector"));
exit(EXIT_SUCCESS);
Modified: grass/branches/develbranch_6/vector/v.in.sites/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.sites/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.in.sites/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -95,12 +95,10 @@
dims, strs, dbls);
if (map_type == FCELL_TYPE || map_type == DCELL_TYPE) {
- G_message(_
- ("Floating point category values, using sequential integer for category"));
+ G_message(_("Floating point category values, using sequential integer for category"));
}
else if (map_type != CELL_TYPE) {
- G_message(_
- ("No category values, using sequential integer for category"));
+ G_message(_("No category values, using sequential integer for category"));
}
clen = (int *)G_calloc(strs, sizeof(int));
Modified: grass/branches/develbranch_6/vector/v.info/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.info/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.info/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -185,15 +185,13 @@
if (columns->answer) {
num_dblinks = Vect_get_num_dblinks(&Map);
if (num_dblinks <= 0) {
- G_fatal_error(_
- ("Database connection for map <%s> is not defined in DB file"),
+ G_fatal_error(_("Database connection for map <%s> is not defined in DB file"),
in_opt->answer);
}
else { /* num_dblinks > 0 */
field = atoi(fieldopt->answer);
- G_message(_
- ("Displaying column types/names for database connection of layer %d:"),
+ G_message(_("Displaying column types/names for database connection of layer %d:"),
field);
if ((fi = Vect_get_field(&Map, field)) == NULL)
G_fatal_error("Database connection not defined");
Modified: grass/branches/develbranch_6/vector/v.kcv/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.kcv/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.kcv/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -134,8 +134,7 @@
Vect_set_open_level(2);
if (Vect_open_old(&In, in_opt->answer, mapset) < 2) {
- G_fatal_error(_
- ("Unable to open vector map <%s> at topological level %d"),
+ G_fatal_error(_("Unable to open vector map <%s> at topological level %d"),
in_opt->answer, 2);
}
Modified: grass/branches/develbranch_6/vector/v.kernel/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.kernel/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.kernel/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -69,8 +69,7 @@
/* resL = (1./(pow(n,2.)*pow(smooth,dimension))) * (resL + n*( gaussianFunction(0.,2.,dimension) - 2. * gaussianKernel(0.,term)) ) + (2./(n*pow(smooth,dimension)))*gaussianKernel(0.,term); */
G_debug(3, "smooth = %e resL = %e", smooth, resL);
- G_message(_
- ("\tScore Value=%f\tsmoothing parameter (standard deviation)=%f"),
+ G_message(_("\tScore Value=%f\tsmoothing parameter (standard deviation)=%f"),
resL, smooth);
return (resL);
@@ -286,8 +285,7 @@
/* valutazione distanza ottimale */
if (flag_o->answer) {
/* Note: sigmaOptimal calculates using ALL points (also those outside the region) */
- G_message(_
- ("Automatic choose of smoothing parameter (standard deviation), maximum possible "
+ G_message(_("Automatic choose of smoothing parameter (standard deviation), maximum possible "
"value of standard deviation is was set to %f"), sigma);
/* maximum distance 4*sigma (3.9*sigma ~ 1.0000), keep it small, otherwise it takes
Modified: grass/branches/develbranch_6/vector/v.label/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.label/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.label/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -249,8 +249,7 @@
if (Along_flag->answer && !fontsize &&
(size / space >= 2 || size / space <= 0.5))
- G_warning(_
- ("size and space options vary significantly which may lead to crummy output"));
+ G_warning(_("size and space options vary significantly which may lead to crummy output"));
/* parse reference answers */
Modified: grass/branches/develbranch_6/vector/v.label.sa/font.c
===================================================================
--- grass/branches/develbranch_6/vector/v.label.sa/font.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.label.sa/font.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -51,8 +51,7 @@
fp = NULL;
if ((capfile = getenv("GRASS_FONT_CAP"))) {
if ((fp = fopen(capfile, "r")) == NULL)
- G_warning(_
- ("%s: Unable to read font definition file; use the default"),
+ G_warning(_("%s: Unable to read font definition file; use the default"),
capfile);
}
if (fp == NULL) {
Modified: grass/branches/develbranch_6/vector/v.lrs/v.lrs.create/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.lrs/v.lrs.create/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.lrs/v.lrs.create/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -474,8 +474,7 @@
if (floor(mp_tmp) != mp_tmp) {
mp_tmp2 = floor(mp_tmp);
off_tmp2 = off_tmp + multip * (mp_tmp - mp_tmp2);
- G_warning(_
- ("Milepost (start) %f+%f used as %f+%f (change MP to integer)"),
+ G_warning(_("Milepost (start) %f+%f used as %f+%f (change MP to integer)"),
mp_tmp, off_tmp, mp_tmp2, off_tmp2);
}
else {
@@ -497,8 +496,7 @@
if (floor(mp_tmp) != mp_tmp) {
mp_tmp2 = floor(mp_tmp);
off_tmp2 = off_tmp + multip * (mp_tmp - mp_tmp2);
- G_warning(_
- ("Milepost (end) %f+%f used as %f+%f (change MP to integer)"),
+ G_warning(_("Milepost (end) %f+%f used as %f+%f (change MP to integer)"),
mp_tmp, off_tmp, mp_tmp2, off_tmp2);
}
else {
@@ -571,8 +569,7 @@
else {
mposts[mpost].line_idx = PORT_INT_MAX;
mposts[mpost].err = ERR_THRESHOLD;
- G_warning(_
- ("Point [%d] cat [%d] is out of threshold (distance = %f)"),
+ G_warning(_("Point [%d] cat [%d] is out of threshold (distance = %f)"),
point, cat, distance_to);
}
}
@@ -721,8 +718,7 @@
mposts[k + 1].end_mp,
mposts[k + 1].end_off);
if (ret > -1) { /* start >= end */
- G_warning(_
- ("Start of 1. MP >= end of 2. MP for points' "
+ G_warning(_("Start of 1. MP >= end of 2. MP for points' "
"cats %[d], [%d]"), mposts[k].cat,
mposts[k + 1].cat);
mposts[k].err = ERR_END_GT_START;
@@ -739,8 +735,7 @@
mposts[k + 1].start_mp,
mposts[k + 1].start_off);
if (ret > -1) { /* start > end */
- G_warning(_
- ("Start of 1. MP >= start of 2. MP for points' "
+ G_warning(_("Start of 1. MP >= start of 2. MP for points' "
"cats [%d], [%d]"), mposts[k].cat,
mposts[k + 1].cat);
mposts[k].err = ERR_END_GT_START;
@@ -750,8 +745,7 @@
}
/* 4) For 2 MPs must be distance along line different (duplicate points) */
if (mposts[k].dist_along == mposts[k + 1].dist_along) {
- G_warning(_
- ("Distance along line identical for points' "
+ G_warning(_("Distance along line identical for points' "
"cats [%d], [%d]"), mposts[k].cat,
mposts[k + 1].cat);
mposts[k].err = ERR_IDENT;
@@ -765,19 +759,16 @@
/* Write errors if any ( and continue ) */
if (!order) { /* something is wrong */
if (rlines[j].nmposts < 2) { /* Impossible to get reference/direction */
- G_warning(_
- ("Not enough points (%d) attached to the line (cat %d), "
+ G_warning(_("Not enough points (%d) attached to the line (cat %d), "
"line skip."), rlines[j].nmposts,
rlines[j].cat);
}
else if (rlines[j].direction == DIR_UNKNOWN) { /* Unknown direction */
- G_warning(_
- ("Unable to guess direction for the line (cat %d), "
+ G_warning(_("Unable to guess direction for the line (cat %d), "
"line skip."), rlines[j].cat);
}
else {
- G_warning(_
- ("Incorrect order of points along line cat [%d]"),
+ G_warning(_("Incorrect order of points along line cat [%d]"),
rlines[j].cat);
rlines[j].err = ERR_LINE_ORDER;
}
Modified: grass/branches/develbranch_6/vector/v.lrs/v.lrs.segment/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.lrs/v.lrs.segment/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.lrs/v.lrs.segment/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -279,8 +279,7 @@
}
/* Check if both points are at the same line */
if (lcat1 != lcat2) {
- G_warning(_
- ("Segment over 2 (or more) segments, not yet supported"));
+ G_warning(_("Segment over 2 (or more) segments, not yet supported"));
break;
}
G_debug(2, "segment: lcat = %d : %f - %f", lcat1, map_offset1,
Modified: grass/branches/develbranch_6/vector/v.mapcalc/number.c
===================================================================
--- grass/branches/develbranch_6/vector/v.mapcalc/number.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.mapcalc/number.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -210,8 +210,7 @@
func = getsym(buf);
if (!func) {
if (opd1->itype == st_num)
- G_warning(_
- ("No function defined to perform ``number %c number''"),
+ G_warning(_("No function defined to perform ``number %c number''"),
op);
else if (opd1->itype == st_pnt)
G_warning(_("No function defined to perform ``point %c point''"),
Modified: grass/branches/develbranch_6/vector/v.net/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.net/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -170,8 +170,7 @@
Vect_set_fatal_error(GV_FATAL_PRINT);
if (1 > Vect_open_new(&Out, output->answer, is3d)) {
Vect_close(&In);
- G_fatal_error(_
- ("Unable to open vector map <%s> at topology level %d"),
+ G_fatal_error(_("Unable to open vector map <%s> at topology level %d"),
output->answer, 2);
}
Modified: grass/branches/develbranch_6/vector/v.net/report.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net/report.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.net/report.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -64,12 +64,10 @@
nnodes++;
}
if (nnodes == 0)
- G_warning(_
- ("Point not found: %.3lf %.3lf %.3lf line category: %d"),
+ G_warning(_("Point not found: %.3lf %.3lf %.3lf line category: %d"),
x, y, z, cat_line);
else if (nnodes > 1)
- G_warning(_
- ("%d points found: %.3lf %.3lf %.3lf line category: %d"),
+ G_warning(_("%d points found: %.3lf %.3lf %.3lf line category: %d"),
nnodes, x, y, z, cat_line);
}
fprintf(stdout, "%d %d %d\n", cat_line, cat_node[0], cat_node[1]);
Modified: grass/branches/develbranch_6/vector/v.net.alloc/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.alloc/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.net.alloc/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -337,8 +337,7 @@
/* First segment */
ret = Vect_line_segment(Points, 0, l1, SPoints);
if (ret == 0) {
- G_warning(_
- ("Cannot get line segment, segment out of line"));
+ G_warning(_("Cannot get line segment, segment out of line"));
}
else {
cat = Centers[centre1].cat;
@@ -349,8 +348,7 @@
/* Second segment */
ret = Vect_line_segment(Points, l1, l, SPoints);
if (ret == 0) {
- G_warning(_
- ("Cannot get line segment, segment out of line"));
+ G_warning(_("Cannot get line segment, segment out of line"));
}
else {
Vect_reset_cats(Cats);
Modified: grass/branches/develbranch_6/vector/v.net.iso/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.iso/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.net.iso/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -175,8 +175,7 @@
/* Should not happen: */
if (niso < 2)
- G_warning(_
- ("Not enough costs, everything reachable falls to first band"));
+ G_warning(_("Not enough costs, everything reachable falls to first band"));
if (geo_f->answer)
geo = 1;
@@ -210,8 +209,7 @@
if (Vect_cat_in_cat_list(cat, catlist)) {
Vect_net_get_node_cost(&Map, node, &n1cost);
if (n1cost == -1) { /* closed */
- G_warning(_
- ("Centre at closed node (costs = -1) ignored"));
+ G_warning(_("Centre at closed node (costs = -1) ignored"));
}
else {
if (acentres == ncentres) {
@@ -233,8 +231,7 @@
G_message(_("Number of centres: [%d] (nlayer: [%d])"), ncentres, nfield);
if (ncentres == 0)
- G_warning(_
- ("Not enough centres for selected nlayer. Nothing will be allocated."));
+ G_warning(_("Not enough centres for selected nlayer. Nothing will be allocated."));
/* alloc and reset space for all nodes */
Nodes = (NODE *) G_calloc((nnodes + 1), sizeof(NODE));
@@ -513,8 +510,7 @@
Vect_line_segment(Points, pnts1[i - 1].distance,
pnts1[i].distance, SPoints);
if (ret == 0) {
- G_warning(_
- ("Cannot get line segment, segment out of line"));
+ G_warning(_("Cannot get line segment, segment out of line"));
}
else {
Vect_reset_cats(Cats);
Modified: grass/branches/develbranch_6/vector/v.out.ascii/out.c
===================================================================
--- grass/branches/develbranch_6/vector/v.out.ascii/out.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.out.ascii/out.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -122,8 +122,7 @@
/*The precision of the output */
if (dp_opt->answer) {
if (sscanf(dp_opt->answer, "%d", &dp) != 1)
- G_fatal_error(_
- ("Failed to interprete 'dp' parameter as an integer"));
+ G_fatal_error(_("Failed to interprete 'dp' parameter as an integer"));
}
Modified: grass/branches/develbranch_6/vector/v.out.ogr/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.out.ogr/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.out.ogr/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -309,8 +309,7 @@
doatt = 1; /* do attributes */
Fi = Vect_get_field(&In, field);
if (Fi == NULL) {
- G_warning(_
- ("No attribute table found -> using only category numbers as attributes"));
+ G_warning(_("No attribute table found -> using only category numbers as attributes"));
Ogr_field = OGR_Fld_Create("cat", OFTInteger);
OGR_L_CreateField(Ogr_layer, Ogr_field, 0);
@@ -325,8 +324,7 @@
db_init_handle(&handle);
db_set_handle(&handle, Fi->database, NULL);
if (db_open_database(Driver, &handle) != DB_OK)
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Fi->database, Fi->driver);
db_set_string(&dbstring, Fi->table);
@@ -396,15 +394,13 @@
if (Vect_get_num_primitives(&In, GV_BOUNDARY) > 0 &&
!(otype & GV_BOUNDARY) && !(otype & GV_AREA))
- G_warning(_
- ("%d boundary(ies) found, but not requested to be exported. "
+ G_warning(_("%d boundary(ies) found, but not requested to be exported. "
"Verify 'type' parameter."), Vect_get_num_primitives(&In,
GV_BOUNDARY));
if (Vect_get_num_primitives(&In, GV_CENTROID) > 0 &&
!(otype & GV_CENTROID) && !(otype & GV_AREA))
- G_warning(_
- ("%d centroid(s) found, but not requested to be exported. "
+ G_warning(_("%d centroid(s) found, but not requested to be exported. "
"Verify 'type' parameter."), Vect_get_num_primitives(&In,
GV_CENTROID));
Modified: grass/branches/develbranch_6/vector/v.out.vtk/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.out.vtk/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.out.vtk/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -171,8 +171,7 @@
/*The precision of the output */
if (dp_opt->answer) {
if (sscanf(dp_opt->answer, "%d", &dp) != 1)
- G_fatal_error(_
- ("Failed to interprete 'dp' parameter as an integer"));
+ G_fatal_error(_("Failed to interprete 'dp' parameter as an integer"));
if (dp > 8 || dp < 0)
G_fatal_error(_("dp has to be from 0 to 8"));
}
@@ -183,8 +182,7 @@
/*The Layer */
if (layer_opt->answer) {
if (sscanf(layer_opt->answer, "%d", &layer) != 1)
- G_fatal_error(_
- ("Failed to interprete 'layer' parameter as an integer"));
+ G_fatal_error(_("Failed to interprete 'layer' parameter as an integer"));
}
else {
layer = 1;
Modified: grass/branches/develbranch_6/vector/v.out.vtk/writeVTK.c
===================================================================
--- grass/branches/develbranch_6/vector/v.out.vtk/writeVTK.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.out.vtk/writeVTK.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -184,8 +184,7 @@
*/
/*break if nothing to generate */
if (info->maxnumpoints == 0)
- G_fatal_error(_
- ("No coordinates to generate the output! Maybe an empty vector type chosen?"));
+ G_fatal_error(_("No coordinates to generate the output! Maybe an empty vector type chosen?"));
/************************************************/
Modified: grass/branches/develbranch_6/vector/v.overlay/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.overlay/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.overlay/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -278,8 +278,7 @@
in_driver =
db_start_driver_open_database(inFi->driver, inFi->database);
if (in_driver == NULL) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
inFi->database, inFi->driver);
}
Modified: grass/branches/develbranch_6/vector/v.patch/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.patch/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.patch/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -130,8 +130,7 @@
db_start_driver_open_database(fi_out->driver,
fi_out->database);
if (!driver_out) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi_out->database, fi_out->driver);
}
@@ -161,8 +160,7 @@
db_start_driver_open_database(fi_in->driver,
fi_in->database);
if (!driver_in) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi_in->database, fi_in->driver);
}
@@ -274,8 +272,7 @@
db_start_driver_open_database(fi_out->driver,
fi_out->database);
if (!driver_out) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi_out->database, fi_out->driver);
}
db_begin_transaction(driver_out);
@@ -333,8 +330,7 @@
db_start_driver_open_database(fi_in->driver,
fi_in->database);
if (!driver_in) {
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
fi_in->database, fi_in->driver);
}
Modified: grass/branches/develbranch_6/vector/v.perturb/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.perturb/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.perturb/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -137,16 +137,14 @@
G_fatal_error(_("Error scanning arguments"));
}
else if (p1 <= 0)
- G_fatal_error(_
- ("Maximum of uniform distribution must be >= zero"));
+ G_fatal_error(_("Maximum of uniform distribution must be >= zero"));
}
else {
if ((i = sscanf(parm.pars->answer, "%lf,%lf", &p1, &p2)) != 2) {
G_fatal_error(_("Error scanning arguments"));
}
if (p2 <= 0)
- G_fatal_error(_
- ("Standard deviation of normal distribution must be >= zero"));
+ G_fatal_error(_("Standard deviation of normal distribution must be >= zero"));
}
G_get_window(&window);
Modified: grass/branches/develbranch_6/vector/v.proj/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.proj/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.proj/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -167,8 +167,7 @@
/* Make sure map is available */
mapset = G_find_vector2(map_name, iset_name);
if (mapset == NULL)
- G_fatal_error(_
- ("Vector map <%s> in location <%s> mapset <%s> not found"),
+ G_fatal_error(_("Vector map <%s> in location <%s> mapset <%s> not found"),
map_name, iloc_name, iset_name);
/*** Get projection info for input mapset ***/
@@ -191,8 +190,7 @@
else if (stat < 0) { /* allow 0 (i.e. denied permission) */
/* need to be able to read from others */
if (stat == 0)
- G_fatal_error(_
- ("Mapset <%s> in input location <%s> - permission denied"),
+ G_fatal_error(_("Mapset <%s> in input location <%s> - permission denied"),
iset_name, iloc_name);
else
G_fatal_error(_("Mapset <%s> in input location <%s> not found"),
Modified: grass/branches/develbranch_6/vector/v.random/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.random/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.random/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -134,8 +134,7 @@
exit(EXIT_FAILURE);
if (flag.z->answer && parm.zcol->answer) {
- G_fatal_error(_
- ("v.random can't create 3D vector and attribute table at same time"));
+ G_fatal_error(_("v.random can't create 3D vector and attribute table at same time"));
}
output = parm.output->answer;
@@ -218,8 +217,7 @@
db_close_database(driver);
db_shutdown_driver(driver);
Vect_delete(parm.output->answer);
- G_fatal_error(_
- ("You have created unsupported column type. This module supports only INTEGER"
+ G_fatal_error(_("You have created unsupported column type. This module supports only INTEGER"
" and DOUBLE PRECISION column types."));
}
}
Modified: grass/branches/develbranch_6/vector/v.reclass/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.reclass/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.reclass/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -358,8 +358,7 @@
}
}
if (over > 0)
- G_warning(_
- ("%d previously set categories overwritten by new category %d"),
+ G_warning(_("%d previously set categories overwritten by new category %d"),
over, cat);
for (i = 0; i < ncats; i++) {
Modified: grass/branches/develbranch_6/vector/v.sample/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.sample/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.sample/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -139,8 +139,7 @@
if (flag.B->answer)
method = BILINEAR;
if (flag.B->answer && flag.C->answer)
- G_fatal_error(_
- ("Flags -b & -c are mutually exclusive. Choose only one."));
+ G_fatal_error(_("Flags -b & -c are mutually exclusive. Choose only one."));
}
else {
method = NEAREST;
@@ -179,8 +178,7 @@
ctype = cvarr.ctype;
if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type <%s> not supported (must be integer or double precision)"),
+ G_fatal_error(_("Column type <%s> not supported (must be integer or double precision)"),
db_sqltype_name(ctype));
if (nrecords < 0)
Modified: grass/branches/develbranch_6/vector/v.segment/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.segment/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.segment/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -154,8 +154,7 @@
NULL);
if (ret == 0) {
len = Vect_line_length(LPoints);
- G_warning(_
- ("Unable to get point on line: cat = %d offset = %f "
+ G_warning(_("Unable to get point on line: cat = %d offset = %f "
"(line length = %.15g)\n%s"), lcat, offset1, len,
buf);
break;
Modified: grass/branches/develbranch_6/vector/v.surf.idw/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.surf.idw/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.surf.idw/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -249,8 +249,7 @@
G_fatal_error(_("Unable to create raster map <%s>"),
parm.output->answer);
- G_important_message(_
- ("Interpolating raster map <%s> (%d rows, %d cols)... "),
+ G_important_message(_("Interpolating raster map <%s> (%d rows, %d cols)... "),
parm.output->answer, window.rows, window.cols);
north = window.north + window.ns_res / 2.0;
Modified: grass/branches/develbranch_6/vector/v.surf.rst/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.surf.rst/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.surf.rst/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -417,12 +417,10 @@
cv = flag.cv->answer;
if ((cv && cvdev == NULL) || (!(cv) && cvdev != NULL))
- G_fatal_error(_
- ("Both cross-validation options (-c flag and cvdev vector output) must be specified"));
+ G_fatal_error(_("Both cross-validation options (-c flag and cvdev vector output) must be specified"));
if ((elev != NULL || cond1 || cond2 || devi != NULL) && cv)
- G_fatal_error(_
- ("The cross-validation cannot be computed simultaneously with output raster or devi file"));
+ G_fatal_error(_("The cross-validation cannot be computed simultaneously with output raster or devi file"));
ertre = 0.1;
sscanf(parm.dmax->answer, "%lf", &dmax);
@@ -440,8 +438,7 @@
if (parm.scalex->answer) {
sscanf(parm.scalex->answer, "%lf", &scalex);
if (!parm.theta->answer)
- G_fatal_error(_
- ("Using anisotropy - both theta and scalex have to be specified"));
+ G_fatal_error(_("Using anisotropy - both theta and scalex have to be specified"));
}
if (parm.rsm->answer) {
@@ -449,8 +446,7 @@
if (rsm < 0.0)
G_fatal_error("Smoothing must be a positive value");
if (scol != NULL)
- G_warning(_
- ("Both smatt and smooth options specified - using constant"));
+ G_warning(_("Both smatt and smooth options specified - using constant"));
}
else {
sscanf(SMOOTH, "%lf", &rsm);
@@ -460,8 +456,7 @@
if (npmin > MAXPOINTS - 50) {
- G_warning(_
- ("The computation will last too long - lower npmin is suggested"));
+ G_warning(_("The computation will last too long - lower npmin is suggested"));
KMAX2 = 2 * npmin; /* was: KMAX2 = npmin + 50; */
}
else
@@ -608,8 +603,7 @@
Tmp_file_z);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_z)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
if (Tmp_file_dx != NULL) {
@@ -618,8 +612,7 @@
Tmp_file_dx);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_dx)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
if (Tmp_file_dy != NULL) {
@@ -628,8 +621,7 @@
Tmp_file_dy);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_dy)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
@@ -639,8 +631,7 @@
Tmp_file_xx);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_xx)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
if (Tmp_file_yy != NULL) {
@@ -649,8 +640,7 @@
Tmp_file_yy);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_yy)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
if (Tmp_file_xy != NULL) {
@@ -659,8 +649,7 @@
Tmp_file_xy);
for (i = 0; i < n_rows; i++) {
if (!(fwrite(zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_xy)))
- G_fatal_error(_
- ("Not enough disk space -- cannot write files"));
+ G_fatal_error(_("Not enough disk space -- cannot write files"));
}
}
Modified: grass/branches/develbranch_6/vector/v.to.db/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.db/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.db/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -44,8 +44,7 @@
Fi = Vect_get_field(&Map, options.field);
if (!options.print && Fi == NULL) {
- G_fatal_error(_
- ("Database connection not defined for layer %d. Use v.db.connect first."),
+ G_fatal_error(_("Database connection not defined for layer %d. Use v.db.connect first."),
options.field);
}
Modified: grass/branches/develbranch_6/vector/v.to.db/parse.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.db/parse.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.db/parse.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -155,14 +155,12 @@
}
if (options.option == O_QUERY && !parms.qcol->answers)
- G_fatal_error(_
- ("Parameter 'qcolumn' must be specified for 'option=query'"));
+ G_fatal_error(_("Parameter 'qcolumn' must be specified for 'option=query'"));
options.qcol = parms.qcol->answer;
if (options.option == O_SIDES && !(options.type | GV_BOUNDARY))
- G_fatal_error(_
- ("The 'sides' option makes sense only for boundaries"));
+ G_fatal_error(_("The 'sides' option makes sense only for boundaries"));
if (options.option == O_SINUOUS && !(options.type | GV_LINES))
G_fatal_error(_("The 'sinuous' option makes sense only for lines"));
Modified: grass/branches/develbranch_6/vector/v.to.db/query.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.db/query.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.db/query.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -79,8 +79,7 @@
db_init_string(&value_string);
if ((Fi = Vect_get_field(Map, options.qfield)) == NULL)
- G_fatal_error(_
- ("Database connection not defined for layer %d. Use v.db.connect first."),
+ G_fatal_error(_("Database connection not defined for layer %d. Use v.db.connect first."),
options.qfield);
/* Open driver */
@@ -105,8 +104,7 @@
/* Skip if cat is zero and large number of query categories (many features without category).
* It would cause problems on server side and take long time. Postgres limit is 10000 */
if (Values[i].cat == 0 && Values[i].nqcats > 1000) {
- G_warning(_
- ("Query for category '0' (no category) was not executed because of too many "
+ G_warning(_("Query for category '0' (no category) was not executed because of too many "
"(%d) query categories. All later reported values for cat 0 are not valid."),
Values[i].nqcats);
continue;
@@ -143,8 +141,7 @@
if (nrows != 1) {
if (nrows > 1) {
- G_warning(_
- ("Multiple query results, output value set to NULL (category [%d])"),
+ G_warning(_("Multiple query results, output value set to NULL (category [%d])"),
Values[i].cat);
}
Values[i].null = 1;
Modified: grass/branches/develbranch_6/vector/v.to.db/report.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.db/report.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.db/report.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -175,14 +175,12 @@
G_message(_("%d records selected from table"), vstat.select);
G_message(_("%d categories read from map exist in selection from table"),
vstat.exist);
- G_message(_
- ("%d categories read from map don't exist in selection from table"),
+ G_message(_("%d categories read from map don't exist in selection from table"),
vstat.notexist);
G_message(_("%d records updated/inserted"), vstat.update);
G_message(_("%d update/insert errors"), vstat.error);
if (vstat.dupl > 0)
- G_message(_
- ("%d categories with more points (coordinates not loaded)"),
+ G_message(_("%d categories with more points (coordinates not loaded)"),
vstat.dupl);
return 0;
Modified: grass/branches/develbranch_6/vector/v.to.db/update.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.db/update.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.db/update.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -23,8 +23,7 @@
db_init_string(&stmt);
if ((Fi = Vect_get_field(Map, options.field)) == NULL)
- G_fatal_error(_
- ("Database connection not defined for layer %d. Use v.db.connect first."),
+ G_fatal_error(_("Database connection not defined for layer %d. Use v.db.connect first."),
options.field);
/* Open driver */
@@ -96,8 +95,7 @@
case O_START:
case O_END:
if (Values[i].count1 > 1) {
- G_warning(_
- ("More elements of category [%d], nothing loaded to DB"),
+ G_warning(_("More elements of category [%d], nothing loaded to DB"),
Values[i].cat);
vstat.dupl++;
continue;
Modified: grass/branches/develbranch_6/vector/v.to.rast/do_lines.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.rast/do_lines.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.rast/do_lines.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -119,8 +119,7 @@
}
if (no_contour > 0)
- G_warning(_
- ("%d lines with varying height were not written to raster"),
+ G_warning(_("%d lines with varying height were not written to raster"),
no_contour);
Vect_destroy_cats_struct(Cats);
Modified: grass/branches/develbranch_6/vector/v.to.rast/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.rast/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.rast/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -107,26 +107,22 @@
case 'a':
use = USE_ATTR;
if (!col->answer)
- G_fatal_error(_
- ("Column parameter missing (or use value parameter)"));
+ G_fatal_error(_("Column parameter missing (or use value parameter)"));
break;
case 'c':
use = USE_CAT;
if (col->answer)
- G_fatal_error(_
- ("Column parameter cannot be combined with use of category values option"));
+ G_fatal_error(_("Column parameter cannot be combined with use of category values option"));
break;
case 'v':
use = USE_VAL;
if (col->answer || label_opt->answer || rgbcol_opt->answer)
- G_fatal_error(_
- ("Column parameter cannot be combined with use of value option"));
+ G_fatal_error(_("Column parameter cannot be combined with use of value option"));
break;
case 'z':
use = USE_Z;
if (col->answer || label_opt->answer || rgbcol_opt->answer)
- G_fatal_error(_
- ("Column parameter cannot be combined with use of z coordinate"));
+ G_fatal_error(_("Column parameter cannot be combined with use of z coordinate"));
break;
case 'd':
use = USE_D;
Modified: grass/branches/develbranch_6/vector/v.to.rast/support.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.rast/support.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.rast/support.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -274,15 +274,13 @@
db_CatValArray_init(&cvarr);
if (!(Fi = Vect_get_field(&Map, field)))
- G_fatal_error(_
- ("Database connection not defined for layer %d"),
+ G_fatal_error(_("Database connection not defined for layer %d"),
field);
if (!
(Driver =
db_start_driver_open_database(Fi->driver, Fi->database)))
- G_fatal_error(_
- ("Unable to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Fi->database, Fi->driver);
/* get number of records in label_column */
@@ -303,8 +301,7 @@
/* get column type */
if (!label_column) {
- G_warning(_
- ("Label column was not specified, no labels will be written"));
+ G_warning(_("Label column was not specified, no labels will be written"));
break;
}
else {
Modified: grass/branches/develbranch_6/vector/v.to.rast/vect2rast.c
===================================================================
--- grass/branches/develbranch_6/vector/v.to.rast/vect2rast.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.to.rast/vect2rast.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -66,8 +66,7 @@
ctype = cvarr.ctype;
if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type (%s) not supported (did you mean 'labelcolumn'?)"),
+ G_fatal_error(_("Column type (%s) not supported (did you mean 'labelcolumn'?)"),
db_sqltype_name(ctype));
if (nrec < 0)
@@ -162,8 +161,7 @@
if (do_areas
(&Map, Points, &cvarr, ctype, field, use, value,
value_type) < 0) {
- G_warning(_
- ("Problem processing areas from vector map <%s>, continuing..."),
+ G_warning(_("Problem processing areas from vector map <%s>, continuing..."),
vector_map);
stat = -1;
break;
@@ -174,8 +172,7 @@
if ((nlines =
do_lines(&Map, Points, &cvarr, ctype, field, use, value,
value_type, ftype, &nplines_all)) < 0) {
- G_warning(_
- ("Problem processing lines from vector map <%s>, continuing..."),
+ G_warning(_("Problem processing lines from vector map <%s>, continuing..."),
vector_map);
stat = -1;
break;
@@ -209,8 +206,7 @@
/* colors */
if (rgbcolumn) {
if (use != USE_ATTR) {
- G_warning(_
- ("Color can be updated from database only if use=attr"));
+ G_warning(_("Color can be updated from database only if use=attr"));
update_colors(raster_map);
}
Modified: grass/branches/develbranch_6/vector/v.transform/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.transform/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.transform/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -198,27 +198,23 @@
/* please remove in GRASS7 */
if (shift_flag->answer)
- G_warning(_
- ("The '%c' flag is deprecated and will be removed in future. "
+ G_warning(_("The '%c' flag is deprecated and will be removed in future. "
"Transformation parameters are used automatically when no pointsfile is given."),
shift_flag->key);
if (quiet_flag->answer) {
- G_warning(_
- ("The '%c' flag is deprecated and will be removed in future. "
+ G_warning(_("The '%c' flag is deprecated and will be removed in future. "
"Please use '--quiet' instead."), quiet_flag->key);
G_putenv("GRASS_VERBOSE", "0");
}
if (!table->answer && columns->answer) {
- G_fatal_error(_
- ("Table name is not defined. Please use '%s' parameter."),
+ G_fatal_error(_("Table name is not defined. Please use '%s' parameter."),
table->key);
}
if (table->answer && strcmp(vnew->answer, table->answer) == 0) {
- G_fatal_error(_
- ("Name of table and name for output vector map must be different. "
+ G_fatal_error(_("Name of table and name for output vector map must be different. "
"Otherwise the table is overwritten."));
}
Modified: grass/branches/develbranch_6/vector/v.transform/trans_digit.c
===================================================================
--- grass/branches/develbranch_6/vector/v.transform/trans_digit.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.transform/trans_digit.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -101,8 +101,7 @@
|| db_test_value_isnull(&val)) {
trans_params[j] = trans_params_def[j];
- G_warning(_
- ("Unable to select value for category %d from table <%s>, column <%s>. "
+ G_warning(_("Unable to select value for category %d from table <%s>, column <%s>. "
"For category %d using default transformation parameter %.3f."),
cat, table, columns[j], cat,
trans_params[j]);
@@ -113,8 +112,7 @@
}
}
else {
- G_warning(_
- ("No category number defined. Using default transformation parameters."));
+ G_warning(_("No category number defined. Using default transformation parameters."));
for (j = 0; j <= IDX_ZROT; j++) {
trans_params[j] = trans_params_def[j];
Modified: grass/branches/develbranch_6/vector/v.univar/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.univar/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.univar/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -125,14 +125,12 @@
compatible = 0;
if (!compatible) {
- G_warning(_
- ("Incompatible vector type(s) specified, only number of features, minimum, maximum and range "
+ G_warning(_("Incompatible vector type(s) specified, only number of features, minimum, maximum and range "
"can be calculated"));
}
if (extended->answer && !(otype & GV_POINTS)) {
- G_warning(_
- ("Extended statistics is currently supported only for points/centroids"));
+ G_warning(_("Extended statistics is currently supported only for points/centroids"));
}
/* Read attributes */
Modified: grass/branches/develbranch_6/vector/v.vol.rst/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.vol.rst/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.vol.rst/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -463,11 +463,9 @@
rsm = -1; /* used in InterpLib to indicate variable smoothing */
if (cv != (cvdev != NULL))
- G_fatal_error(_
- ("Both crossvalidation options (-c, cvdev) must be specified"));
+ G_fatal_error(_("Both crossvalidation options (-c, cvdev) must be specified"));
if (cv && devi != NULL)
- G_fatal_error(_
- ("Both crossvalidation and deviations file specified"));
+ G_fatal_error(_("Both crossvalidation and deviations file specified"));
if (cellinp == NULL && outz == NULL && cellout == NULL && gradient == NULL
&& aspect1 == NULL && aspect2 == NULL && ncurv == NULL &&
gcurv == NULL && mcurv == NULL) {
Modified: grass/branches/develbranch_6/vector/v.vol.rst/user1.c
===================================================================
--- grass/branches/develbranch_6/vector/v.vol.rst/user1.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.vol.rst/user1.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -104,8 +104,7 @@
G_debug(3, "nrec = %d", nrec);
if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type of wcolumn is not supported (must be integer or double)"));
+ G_fatal_error(_("Column type of wcolumn is not supported (must be integer or double)"));
if (nrec < 0)
G_fatal_error("Unable to select data from table");
@@ -124,8 +123,7 @@
G_fatal_error
("Column type of smooth column (datetime) is not supported");
if (sctype != DB_C_TYPE_INT && sctype != DB_C_TYPE_DOUBLE)
- G_fatal_error(_
- ("Column type of smooth column is not supported (must be integer or double)"));
+ G_fatal_error(_("Column type of smooth column is not supported (must be integer or double)"));
}
Points = Vect_new_line_struct();
Modified: grass/branches/develbranch_6/vector/v.what.rast/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.what.rast/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/vector/v.what.rast/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -163,8 +163,7 @@
G_warning(_("Raster type is integer and column type is float"));
if (out_type != CELL_TYPE && col_type == DB_C_TYPE_INT)
- G_warning(_
- ("Raster type is float and column type is integer, some data lost!!"));
+ G_warning(_("Raster type is float and column type is integer, some data lost!!"));
/* Read vector points to cache */
Cache_size = Vect_get_num_primitives(&Map, GV_POINT);
@@ -302,8 +301,7 @@
for (point = 0; point < point_cnt; point++) {
if (cache[point].count > 1) {
- G_warning(_
- ("More points (%d) of category %d, value set to 'NULL'"),
+ G_warning(_("More points (%d) of category %d, value set to 'NULL'"),
cache[point].count, cache[point].cat);
dupl_cnt++;
}
Modified: grass/branches/develbranch_6/visualization/nviz/src/nviz_init.c
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/src/nviz_init.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/visualization/nviz/src/nviz_init.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -276,8 +276,7 @@
}
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) {
Modified: grass/branches/develbranch_6/visualization/nviz2/cmd/args.c
===================================================================
--- grass/branches/develbranch_6/visualization/nviz2/cmd/args.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/visualization/nviz2/cmd/args.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -519,8 +519,7 @@
/* 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 @@
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 @@
/* 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 @@
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);
Modified: grass/branches/develbranch_6/visualization/nviz2/cmd/main.c
===================================================================
--- grass/branches/develbranch_6/visualization/nviz2/cmd/main.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/visualization/nviz2/cmd/main.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -120,8 +120,7 @@
}
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);
Modified: grass/branches/develbranch_6/visualization/nviz2/cmd/surface.c
===================================================================
--- grass/branches/develbranch_6/visualization/nviz2/cmd/surface.c 2008-08-06 19:37:34 UTC (rev 32582)
+++ grass/branches/develbranch_6/visualization/nviz2/cmd/surface.c 2008-08-06 21:37:41 UTC (rev 32583)
@@ -68,8 +68,7 @@
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 @@
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));
}
More information about the grass-commit
mailing list