From b9aa579643309ae71891262bdaf2a4b7e737f916 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 12 Oct 2026 14:10:47 +0000 Subject: [PATCH] i18n: Use one variant for near-duplicate source strings Many messages were translated separately only because they differed in the quoting of the placeholder, in capitalization, in a trailing period, in the spacing of an ellipsis or in the wording, for example "Unable to open file '%s' for writing." and "Unable to open file <%s> for writing", or "Out of memory!" and "Out of memory". Use one variant for each across the libraries, tools and the GUI, following the formatting rules of the style guide: names of maps, groups, tables and the like in <>, file paths and SQL in single quotes, a capital first letter, no contractions, a period on errors and on messages with complete sentences, none on short phrases and labels, and an ellipsis for ongoing actions. The runtime warnings about deprecated flags are now one string with the flag and the output format passed as arguments, using "Use" instead of "Please use" as in the flag descriptions. The candidate strings were found with a script comparing the message catalogs and rewritten semi-automatically; Claude was used for this. --- db/db.connect/main.c | 6 ++-- db/db.execute/main.c | 2 +- db/db.select/main.c | 12 +++---- db/drivers/dbf/column.c | 2 +- db/drivers/dbf/create_table.c | 2 +- db/drivers/dbf/cursor.c | 2 +- db/drivers/dbf/dbfexe.c | 9 ++--- db/drivers/dbf/describe.c | 2 +- db/drivers/mysql/describe.c | 2 +- db/drivers/odbc/cursor.c | 2 +- db/drivers/odbc/table.c | 2 +- db/drivers/ogr/cursor.c | 4 +-- db/drivers/postgres/listdb.c | 2 +- db/drivers/postgres/listtab.c | 2 +- db/drivers/postgres/select.c | 2 +- db/drivers/sqlite/listdb.c | 4 +-- display/d.extract/main.c | 4 +-- display/d.grid/main.c | 5 +-- display/d.grid/plot.c | 34 +++++++++---------- display/d.legend.vect/draw.c | 2 +- display/d.legend.vect/main.c | 2 +- display/d.linegraph/main.c | 8 +++-- display/d.mon/list.c | 2 +- display/d.mon/start.c | 8 +++-- display/d.mon/stop.c | 6 ++-- display/d.path/main.c | 2 +- display/d.profile/main.c | 2 +- display/d.text/main.c | 2 +- display/d.vect.chart/main.c | 2 +- display/d.vect.chart/plot.c | 5 +-- display/d.vect.thematic/main.c | 4 +-- display/d.vect.thematic/plot1.c | 4 +-- display/d.vect/attr.c | 2 +- display/d.vect/main.c | 10 +++--- display/d.vect/opt.c | 2 +- display/d.vect/shape.c | 6 ++-- display/d.where/main.c | 2 +- display/d.where/where.c | 2 +- doc/examples/raster/r.example/main.c | 2 +- doc/examples/vector/v.example/main.c | 6 ++-- general/g.cairocomp/main.c | 4 +-- general/g.list/main.c | 4 +-- general/g.mkfontcap/freetype_fonts.c | 2 +- general/g.pnmcomp/main.c | 6 ++-- general/g.ppmtopng/main.c | 4 +-- general/g.proj/create.c | 2 +- general/g.proj/input.c | 2 +- general/g.proj/main.c | 18 +++++----- general/g.region/main.c | 16 ++++----- general/g.version/main.c | 6 ++-- general/manage/lister/vector.c | 2 +- gui/wxpython/animation/data.py | 2 +- gui/wxpython/animation/dialogs.py | 3 +- gui/wxpython/core/render.py | 2 +- gui/wxpython/core/workspace.py | 2 +- gui/wxpython/gmodeler/model.py | 4 +-- gui/wxpython/gmodeler/panels.py | 2 +- gui/wxpython/gui_core/forms.py | 4 +-- gui/wxpython/gui_core/ghelp.py | 2 +- gui/wxpython/iclass/dialogs.py | 2 +- gui/wxpython/iclass/frame.py | 2 +- gui/wxpython/iclass/g.gui.iclass.py | 4 +-- gui/wxpython/lmgr/workspace.py | 2 +- gui/wxpython/location_wizard/wizard.py | 2 +- gui/wxpython/mapdisp/toolbars.py | 2 +- gui/wxpython/mapswipe/g.gui.mapswipe.py | 2 +- gui/wxpython/modules/histogram.py | 2 +- gui/wxpython/nviz/mapwindow.py | 2 +- gui/wxpython/nviz/wxnviz.py | 8 ++--- gui/wxpython/psmap/frame.py | 4 +-- gui/wxpython/psmap/instructions.py | 24 ++++++------- gui/wxpython/rlisetup/wizard.py | 2 +- gui/wxpython/vdigit/g.gui.vdigit.py | 4 +-- gui/wxpython/vnet/dialogs.py | 2 +- gui/wxpython/vnet/vnet_core.py | 4 +-- gui/wxpython/web_services/widgets.py | 2 +- imagery/i.atcorr/6s.cpp | 2 +- imagery/i.cluster/main.c | 4 +-- imagery/i.cluster/open_files.c | 2 +- imagery/i.eb.soilheatflux/main.c | 2 +- imagery/i.fft/main.c | 2 +- imagery/i.gensig/parse.c | 4 +-- imagery/i.gensigset/parse.c | 4 +-- imagery/i.group/main.c | 10 +++--- imagery/i.maxlik/open.c | 4 +-- imagery/i.ortho.photo/i.ortho.elev/main.c | 2 +- imagery/i.ortho.photo/i.ortho.init/main.c | 2 +- imagery/i.ortho.photo/i.ortho.rectify/cp.c | 2 +- imagery/i.ortho.photo/i.ortho.rectify/main.c | 2 +- .../i.ortho.photo/i.ortho.transform/main.c | 4 +-- imagery/i.pca/main.c | 4 +-- imagery/i.rectify/cp.c | 2 +- imagery/i.rectify/main.c | 2 +- imagery/i.segment/cluster.c | 2 +- imagery/i.segment/flag.c | 4 +-- imagery/i.segment/parse_args.c | 8 ++--- imagery/i.smap/multialloc.c | 2 +- imagery/i.smap/openfiles.c | 4 +-- imagery/i.smap/parse.c | 2 +- imagery/i.smap/write_img.c | 2 +- imagery/i.svm.train/main.c | 2 +- imagery/i.target/main.c | 2 +- lib/cairodriver/read_xid.c | 2 +- lib/cairodriver/write_xid.c | 2 +- lib/db/dbmi_base/login.c | 2 +- lib/db/dbmi_client/copy_tab.c | 10 +++--- lib/db/dbmi_client/delete_tab.c | 2 +- lib/db/dbmi_client/table.c | 2 +- lib/gis/legal_name.c | 4 +-- lib/gis/ls.c | 2 +- lib/gis/paths.c | 2 +- lib/gpde/n_arrays_io.c | 2 +- lib/manage/do_remove.c | 4 +-- lib/manage/do_rename.c | 4 +-- lib/ogsf/gk2.c | 2 +- lib/ogsf/gp3.c | 6 ++-- lib/ogsf/gs3.c | 20 +++++------ lib/ogsf/gsd_img_ppm.c | 4 +-- lib/ogsf/gsd_img_tif.c | 2 +- lib/ogsf/gsd_legend.c | 2 +- lib/ogsf/gv3.c | 6 ++-- lib/ogsf/gvl3.c | 2 +- lib/ogsf/gvl_file.c | 2 +- lib/pngdriver/read_png.c | 2 +- lib/raster/open.c | 8 ++--- lib/rowio/setup.c | 4 +-- lib/rst/interp_float/input2d.c | 2 +- lib/rst/interp_float/interp2d.c | 4 +-- lib/rst/interp_float/output2d.c | 14 ++++---- lib/rst/interp_float/resout2d.c | 16 ++++----- lib/rst/interp_float/segmen2d.c | 8 ++--- lib/rst/interp_float/segmen2d_parallel.c | 10 +++--- lib/rst/interp_float/vinput2d.c | 8 ++--- lib/segment/open.c | 2 +- lib/vector/Vlib/array.c | 2 +- lib/vector/Vlib/ascii.c | 6 ++-- lib/vector/Vlib/cats.c | 2 +- lib/vector/Vlib/close.c | 4 +-- lib/vector/Vlib/copy.c | 4 +-- lib/vector/Vlib/header.c | 2 +- lib/vector/Vlib/line.c | 4 +-- lib/vector/Vlib/map.c | 17 +++++----- lib/vector/Vlib/net_build.c | 10 +++--- lib/vector/Vlib/open.c | 4 +-- lib/vector/Vlib/write_ogr.c | 3 +- lib/vector/diglib/struct_alloc.c | 2 +- lib/vector/neta/articulation_point.c | 2 +- lib/vector/neta/bridge.c | 2 +- lib/vector/neta/centrality.c | 4 +-- lib/vector/neta/components.c | 4 +-- lib/vector/neta/flow.c | 4 +-- lib/vector/neta/path.c | 2 +- lib/vector/neta/spanningtree.c | 2 +- lib/vector/neta/timetables.c | 27 ++++++++------- lib/vector/neta/utils.c | 3 +- misc/m.measure/main.c | 8 ++--- misc/m.nviz.image/main.c | 4 +-- misc/m.nviz.image/surface.c | 4 +-- misc/m.nviz.image/vector.c | 2 +- misc/m.nviz.image/volume.c | 4 +-- misc/m.nviz.script/main.c | 2 +- misc/m.transform/main.c | 6 ++-- ps/ps.map/do_geogrid.c | 30 ++++++++-------- ps/ps.map/main.c | 2 +- ps/ps.map/ps_vpoints.c | 2 +- ps/ps.map/r_instructions.c | 2 +- raster/r.basins.fill/read_map.c | 2 +- raster/r.buffer/main.c | 2 +- raster/r.buildvrt/link.c | 2 +- raster/r.buildvrt/main.c | 2 +- raster/r.carve/main.c | 5 +-- raster/r.carve/vect.c | 2 +- raster/r.category/main.c | 6 ++-- raster/r.clump/clump.c | 4 +-- raster/r.clump/minsize.c | 2 +- raster/r.coin/main.c | 4 +-- raster/r.colors.out/raster3d_main.c | 2 +- raster/r.colors.out/raster_main.c | 2 +- raster/r.colors/edit_colors.c | 4 +-- raster/r.colors/stats.c | 2 +- raster/r.compress/main.c | 4 +-- raster/r.contour/main.c | 6 ++-- raster/r.cost/flag.c | 4 +-- raster/r.cost/main.c | 10 +++--- raster/r.cross/main.c | 2 +- raster/r.describe/describe.c | 2 +- raster/r.distance/parse.c | 4 +-- raster/r.drain/main.c | 4 +-- raster/r.external/link.c | 2 +- raster/r.external/proj.c | 6 ++-- raster/r.fill.stats/main.c | 2 +- raster/r.flow/flow_io.c | 6 ++-- raster/r.geomorphon/main.c | 4 +-- raster/r.geomorphon/memory.c | 2 +- raster/r.horizon/main.c | 2 +- raster/r.in.bin/main.c | 8 ++--- raster/r.in.gdal/main.c | 8 ++--- raster/r.in.gdal/proj.c | 6 ++-- raster/r.in.lidar/main.c | 10 +++--- raster/r.in.lidar/projection.c | 5 ++- raster/r.in.mat/main.c | 2 +- raster/r.in.pdal/filters.c | 2 +- raster/r.in.pdal/main.cpp | 4 +-- raster/r.in.pdal/projection.c | 2 +- raster/r.in.poly/main.c | 2 +- raster/r.in.poly/poly2rast.c | 2 +- raster/r.in.xyz/main.c | 12 +++---- raster/r.info/main.c | 2 +- raster/r.kappa/main.c | 2 +- raster/r.kappa/stats.c | 4 +-- raster/r.li/r.li.daemon/list.c | 4 +-- raster/r.mapcalc/expression.c | 2 +- raster/r.mapcalc/main.c | 2 +- raster/r.mapcalc/map.c | 4 +-- raster/r.mapcalc/map3.c | 2 +- raster/r.mfilter/perform.c | 2 +- raster/r.mode/main.c | 2 +- raster/r.null/main.c | 2 +- raster/r.object.geometry/main.c | 4 +-- raster/r.out.ascii/main.c | 6 ++-- raster/r.out.gdal/main.c | 2 +- raster/r.out.mat/main.c | 2 +- raster/r.out.mpeg/main.c | 2 +- raster/r.out.mpeg/write.c | 4 +-- raster/r.out.png/main.c | 2 +- raster/r.out.pov/main.c | 2 +- raster/r.out.ppm/main.c | 2 +- raster/r.out.ppm3/main.c | 4 +-- raster/r.out.vrml/main.c | 6 ++-- raster/r.path/main.c | 4 +-- raster/r.profile/main.c | 2 +- raster/r.proj/main.c | 6 ++-- raster/r.quant/read_rules.c | 2 +- raster/r.quantile/main.c | 2 +- raster/r.random/random.c | 8 ++--- raster/r.random/support.c | 2 +- raster/r.reclass/main.c | 6 ++-- raster/r.recode/main.c | 2 +- raster/r.region/main.c | 2 +- raster/r.regression.line/main.c | 8 ++--- raster/r.regression.multi/main.c | 8 ++--- raster/r.report/parse.c | 2 +- raster/r.resamp.bspline/main.c | 8 ++--- raster/r.resamp.filter/main.c | 2 +- raster/r.resamp.interp/main.c | 3 +- raster/r.resamp.rst/main.c | 2 +- raster/r.resamp.stats/main.c | 2 +- raster/r.rescale.eq/get_stats.c | 2 +- raster/r.rescale/get_range.c | 2 +- raster/r.ros/main.c | 21 ++++++------ raster/r.series.accumulate/main.c | 2 +- raster/r.series/main.c | 2 +- raster/r.sim/simlib/observation_points.c | 3 +- raster/r.sim/simlib/output.c | 12 +++---- raster/r.smooth.edgepreserve/main.c | 2 +- raster/r.spread/main.c | 14 ++++---- raster/r.stats.quantile/main.c | 8 ++--- raster/r.stats/main.c | 2 +- raster/r.stream.extract/bseg.c | 2 +- raster/r.stream.extract/close.c | 7 ++-- raster/r.stream.extract/cseg.c | 2 +- raster/r.stream.extract/dseg.c | 2 +- raster/r.stream.extract/main.c | 6 ++-- raster/r.stream.extract/seg.c | 2 +- raster/r.sun/main.c | 20 +++++------ raster/r.support/main.c | 4 +-- raster/r.terraflow/main.cpp | 6 ++-- raster/r.tile/main.c | 4 +-- raster/r.to.rast3/main.c | 6 ++-- raster/r.to.rast3elev/main.c | 4 +-- raster/r.to.vect/main.c | 5 +-- raster/r.topmodel/file_io.c | 6 ++-- raster/r.univar/r.univar_main.c | 19 +++++------ raster/r.univar/r3.univar_main.c | 21 ++++++------ raster/r.viewshed/grass.cpp | 6 ++-- raster/r.volume/main.c | 11 +++--- raster/r.walk/flag.c | 4 +-- raster/r.walk/main.c | 14 ++++---- raster/r.water.outlet/main.c | 4 +-- raster/r.watershed/seg/bseg_open.c | 2 +- raster/r.watershed/seg/cseg_open.c | 2 +- raster/r.watershed/seg/dseg_open.c | 2 +- raster/r.watershed/seg/sseg_open.c | 2 +- raster/r.watershed/shed/main.c | 2 +- raster/r.what/main.c | 4 +-- raster3d/r3.cross.rast/main.c | 4 +-- raster3d/r3.flow/flowline.c | 2 +- raster3d/r3.flow/main.c | 8 ++--- raster3d/r3.in.ascii/main.c | 2 +- raster3d/r3.in.bin/main.c | 6 ++-- raster3d/r3.in.lidar/filters.c | 4 +-- raster3d/r3.in.lidar/main.c | 2 +- raster3d/r3.in.lidar/projection.c | 5 ++- raster3d/r3.in.v5d/main.c | 2 +- raster3d/r3.info/main.c | 2 +- raster3d/r3.mask/main.c | 2 +- raster3d/r3.neighbors/main.c | 2 +- raster3d/r3.null/main.c | 2 +- raster3d/r3.out.ascii/main.c | 6 ++-- raster3d/r3.out.bin/main.c | 2 +- raster3d/r3.out.netcdf/main.c | 4 +-- raster3d/r3.out.v5d/main.c | 6 ++-- raster3d/r3.out.vtk/main.c | 10 +++--- raster3d/r3.retile/main.c | 6 ++-- raster3d/r3.stats/main.c | 2 +- raster3d/r3.support/main.c | 6 ++-- raster3d/r3.timestamp/main.c | 2 +- raster3d/r3.to.rast/main.c | 8 ++--- scripts/d.correlate/d.correlate.py | 2 +- scripts/d.polar/d.polar.py | 2 +- scripts/d.rast.leg/d.rast.leg.py | 4 +-- scripts/d.what.rast/d.what.rast.py | 2 +- scripts/d.what.vect/d.what.vect.py | 2 +- scripts/db.in.ogr/db.in.ogr.py | 2 +- scripts/db.out.ogr/db.out.ogr.py | 2 +- scripts/db.univar/db.univar.py | 2 +- scripts/i.tasscap/i.tasscap.py | 2 +- scripts/r.buffer.lowmem/r.buffer.lowmem.py | 2 +- scripts/r.fillnulls/r.fillnulls.py | 2 +- scripts/r.grow/r.grow.py | 2 +- scripts/r.in.wms/wms_base.py | 2 +- scripts/r.mask/r.mask.py | 2 +- scripts/r.pack/r.pack.py | 2 +- scripts/r.reclass.area/r.reclass.area.py | 2 +- scripts/r.rgb/r.rgb.py | 2 +- scripts/r.unpack/r.unpack.py | 2 +- scripts/r3.in.xyz/r3.in.xyz.py | 2 +- scripts/v.db.addtable/v.db.addtable.py | 2 +- scripts/v.db.droptable/v.db.droptable.py | 2 +- scripts/v.db.univar/v.db.univar.py | 2 +- scripts/v.db.update/v.db.update.py | 4 +-- scripts/v.dissolve/v.dissolve.py | 4 +-- scripts/v.in.geonames/v.in.geonames.py | 2 +- scripts/v.rast.stats/v.rast.stats.py | 2 +- scripts/v.unpack/v.unpack.py | 8 ++--- scripts/v.what.strds/v.what.strds.py | 2 +- temporal/t.connect/main.c | 6 ++-- temporal/t.vect.import/t.vect.import.py | 2 +- vector/v.buffer/main.c | 12 +++---- vector/v.build.polylines/main.c | 4 +-- vector/v.build/main.c | 7 ++-- vector/v.category/main.c | 6 ++-- vector/v.class/main.c | 4 +-- vector/v.clean/main.c | 6 ++-- vector/v.clean/test/topocheck.c | 5 +-- vector/v.cluster/main.c | 6 ++-- vector/v.colors.out/main.c | 2 +- vector/v.colors.out/make_colors.c | 4 +-- vector/v.colors.out/scan_cats.c | 2 +- vector/v.colors/main.c | 6 ++-- vector/v.colors/read_rgb.c | 3 +- vector/v.colors/scan_attr.c | 3 +- vector/v.colors/write_rgb.c | 3 +- vector/v.db.connect/main.c | 13 +++---- vector/v.db.select/main.c | 9 ++--- vector/v.decimate/main.c | 6 ++-- vector/v.delaunay/main.c | 4 +-- vector/v.distance/main.c | 20 +++++------ vector/v.drape/main.c | 6 ++-- vector/v.edit/main.c | 13 +++---- vector/v.edit/select.c | 3 +- vector/v.external/list.c | 2 +- vector/v.external/main.c | 8 ++--- vector/v.external/proj.c | 6 ++-- vector/v.extract/extract.c | 2 +- vector/v.extract/main.c | 8 ++--- vector/v.extrude/main.c | 9 ++--- vector/v.fill.holes/main.c | 4 +-- vector/v.generalize/main.c | 4 +-- vector/v.generalize/matrix.c | 2 +- vector/v.generalize/misc.c | 2 +- vector/v.generalize/network.c | 4 +-- vector/v.generalize/simplification.c | 10 +++--- vector/v.generalize/smoothing.c | 22 ++++++------ vector/v.hull/main.c | 4 +-- vector/v.in.ascii/main.c | 4 +-- vector/v.in.ascii/points.c | 2 +- vector/v.in.db/main.c | 4 +-- vector/v.in.dxf/main.c | 2 +- vector/v.in.dxf/write_vect.c | 4 +-- vector/v.in.lidar/attributes.c | 2 +- vector/v.in.lidar/main.c | 8 ++--- vector/v.in.lidar/projection.c | 5 ++- vector/v.in.ogr/main.c | 16 ++++----- vector/v.in.ogr/proj.c | 6 ++-- vector/v.in.pdal/main.cpp | 4 +-- vector/v.in.pdal/projection.c | 4 +-- vector/v.in.region/main.c | 2 +- vector/v.info/main.c | 2 +- vector/v.kcv/main.c | 7 ++-- vector/v.kernel/main.c | 7 ++-- vector/v.label.sa/labels.c | 4 +-- vector/v.label/main.c | 2 +- vector/v.lidar.correction/main.c | 8 ++--- vector/v.lidar.edgedetection/main.c | 6 ++-- vector/v.lidar.growing/main.c | 4 +-- vector/v.lrs/v.lrs.create/main.c | 12 +++---- vector/v.lrs/v.lrs.label/main.c | 4 +-- vector/v.lrs/v.lrs.segment/main.c | 10 +++--- vector/v.lrs/v.lrs.where/main.c | 4 +-- vector/v.mkgrid/main.c | 12 ++++--- vector/v.mkgrid/write_grid.c | 2 +- vector/v.neighbors/main.c | 4 +-- vector/v.net.alloc/main.c | 26 +++++++------- vector/v.net.allpairs/main.c | 12 +++---- vector/v.net.bridge/main.c | 4 +-- vector/v.net.centrality/main.c | 21 ++++++------ vector/v.net.components/main.c | 12 +++---- vector/v.net.connectivity/main.c | 8 ++--- vector/v.net.distance/main.c | 12 +++---- vector/v.net.flow/main.c | 14 ++++---- vector/v.net.iso/main.c | 12 +++---- vector/v.net.path/main.c | 4 +-- vector/v.net.path/path.c | 8 ++--- vector/v.net.salesman/main.c | 6 ++-- vector/v.net.spanningtree/main.c | 4 +-- vector/v.net.steiner/main.c | 4 +-- vector/v.net.timetable/main.c | 19 ++++++----- vector/v.net.visibility/main.c | 6 ++-- vector/v.net/main.c | 8 ++--- vector/v.normal/main.c | 2 +- vector/v.out.ascii/main.c | 6 ++-- vector/v.out.dxf/main.c | 2 +- vector/v.out.dxf/write_dxf.c | 4 +-- vector/v.out.lidar/main.c | 8 ++--- vector/v.out.ogr/main.c | 2 +- vector/v.out.postgis/args.c | 2 +- vector/v.out.postgis/main.c | 2 +- vector/v.out.pov/main.c | 2 +- vector/v.out.svg/main.c | 2 +- vector/v.out.vtk/main.c | 2 +- vector/v.outlier/main.c | 8 ++--- vector/v.overlay/area_area.c | 2 +- vector/v.overlay/line_area.c | 2 +- vector/v.overlay/main.c | 8 ++--- vector/v.parallel/main.c | 4 +-- vector/v.patch/main.c | 18 +++++----- vector/v.perturb/main.c | 6 ++-- vector/v.ppa/main.c | 8 ++--- vector/v.profile/main.c | 8 ++--- vector/v.profile/processors.c | 2 +- vector/v.proj/main.c | 4 +-- vector/v.qcount/main.c | 4 +-- vector/v.random/main.c | 13 +++---- vector/v.reclass/main.c | 8 ++--- vector/v.rectify/main.c | 9 +++-- vector/v.sample/main.c | 11 +++--- vector/v.segment/main.c | 10 +++--- vector/v.select/main.c | 4 +-- vector/v.split/main.c | 4 +-- vector/v.support/main.c | 2 +- vector/v.surf.bspline/crosscorr.c | 5 +-- vector/v.surf.bspline/main.c | 4 +-- vector/v.surf.idw/read_sites.c | 4 +-- vector/v.surf.rst/main.c | 14 ++++---- vector/v.to.3d/main.c | 4 +-- vector/v.to.3d/trans2.c | 2 +- vector/v.to.3d/trans3.c | 2 +- vector/v.to.db/main.c | 2 +- vector/v.to.db/parse.c | 4 +-- vector/v.to.points/main.c | 8 ++--- vector/v.to.points/write.c | 2 +- vector/v.to.rast/support.c | 24 +++++++------ vector/v.to.rast/vect2rast.c | 8 ++--- vector/v.to.rast3/main.c | 4 +-- vector/v.transform/main.c | 4 +-- vector/v.type/main.c | 2 +- vector/v.univar/main.c | 12 +++---- vector/v.vect.stats/main.c | 10 +++--- vector/v.vol.rst/main.c | 14 ++++---- vector/v.vol.rst/user1.c | 4 +-- vector/v.voronoi/main.c | 6 ++-- vector/v.what.rast/main.c | 4 +-- vector/v.what.rast3/main.c | 7 ++-- vector/v.what/main.c | 14 ++++---- 475 files changed, 1203 insertions(+), 1162 deletions(-) diff --git a/db/db.connect/main.c b/db/db.connect/main.c index ea5f646bdd3..e277a57c746 100644 --- a/db/db.connect/main.c +++ b/db/db.connect/main.c @@ -150,9 +150,9 @@ int main(int argc, char *argv[]) } if (shell->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON) { G_fatal_error(_("The -g flag cannot be used with format=json. " "Please select only one output format.")); diff --git a/db/db.execute/main.c b/db/db.execute/main.c index c53166d7401..e032583dd80 100644 --- a/db/db.execute/main.c +++ b/db/db.execute/main.c @@ -49,7 +49,7 @@ int main(int argc, char **argv) if (parms.input && strcmp(parms.input, "-") != 0) { fd = fopen(parms.input, "r"); if (fd == NULL) { - G_fatal_error(_("Unable to open file <%s>: %s"), parms.input, + G_fatal_error(_("Unable to open file '%s': %s."), parms.input, strerror(errno)); } } diff --git a/db/db.select/main.c b/db/db.select/main.c index f465a9a4997..19b180f2931 100644 --- a/db/db.select/main.c +++ b/db/db.select/main.c @@ -81,7 +81,7 @@ int main(int argc, char **argv) if (parms.input && strcmp(parms.input, "-") != 0) { fd = fopen(parms.input, "r"); if (fd == NULL) { - G_fatal_error(_("Unable to open file <%s>: %s"), parms.input, + G_fatal_error(_("Unable to open file '%s': %s."), parms.input, strerror(errno)); } } @@ -90,7 +90,7 @@ int main(int argc, char **argv) if (parms.output && strcmp(parms.output, "-") != 0) { if (NULL == freopen(parms.output, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), + G_fatal_error(_("Unable to open file '%s' for writing."), parms.output); } } @@ -534,7 +534,7 @@ void parse_command_line(int argc, char **argv) // Check for mutually exclusive options if (parms.format == JSON) { fatal_error_option_value_excludes_option( - format, fs, _("Separator is part of the format")); + format, fs, _("Separator is part of the format.")); fatal_error_option_value_excludes_option( format, vs, _("Vertical separator is part of the format")); fatal_error_option_value_excludes_option( @@ -543,9 +543,9 @@ void parse_command_line(int argc, char **argv) format, c, _("Column names are always included")); } if (v->answer) { - G_verbose_message( - _("Flag 'v' is deprecated and will be removed in a future " - "release. Please use format=vertical instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'v', "vertical"); if (format->answer && parms.format != VERTICAL) { G_fatal_error(_("Flag 'v' is only allowed with format=vertical.")); } diff --git a/db/drivers/dbf/column.c b/db/drivers/dbf/column.c index 97dd7377f74..a0c3edd313b 100644 --- a/db/drivers/dbf/column.c +++ b/db/drivers/dbf/column.c @@ -92,7 +92,7 @@ int drop_column(int tab, char *name) /* Check if the column exists */ c = find_column(tab, name); if (c == -1) { - db_d_append_error(_("Column '%s' does not exist"), name); + db_d_append_error(_("Column <%s> does not exist."), name); db_d_report_error(); return DB_FAILED; } diff --git a/db/drivers/dbf/create_table.c b/db/drivers/dbf/create_table.c index 738c50e11bf..b403e918e3f 100644 --- a/db/drivers/dbf/create_table.c +++ b/db/drivers/dbf/create_table.c @@ -19,7 +19,7 @@ int db__driver_create_table(dbTable *table) ret = execute(db_get_string(&sql), NULL); if (ret == DB_FAILED) { - db_d_append_error(_("Unable to create table")); + db_d_append_error(_("Unable to create table.")); db_d_report_error(); return DB_FAILED; } diff --git a/db/drivers/dbf/cursor.c b/db/drivers/dbf/cursor.c index ba491aaab49..ac9b2365c5a 100644 --- a/db/drivers/dbf/cursor.c +++ b/db/drivers/dbf/cursor.c @@ -39,7 +39,7 @@ cursor *alloc_cursor(void) /* allocate the cursor */ c = (cursor *)db_malloc(sizeof(cursor)); if (c == NULL) { - db_d_append_error(_("Unable to allocate new cursor")); + db_d_append_error(_("Unable to allocate cursor.")); db_d_report_error(); return c; } diff --git a/db/drivers/dbf/dbfexe.c b/db/drivers/dbf/dbfexe.c index 263a6e37d05..cf22e4218e5 100644 --- a/db/drivers/dbf/dbfexe.c +++ b/db/drivers/dbf/dbfexe.c @@ -76,7 +76,7 @@ int execute(char *sql, cursor *c) /* find table */ tab = find_table(st->table); if (tab < 0 && st->command != SQLP_CREATE) { - db_d_append_error(_("Table '%s' doesn't exist."), st->table); + db_d_append_error(_("Table <%s> does not exist."), st->table); return DB_FAILED; } @@ -109,7 +109,8 @@ int execute(char *sql, cursor *c) for (i = 0; i < ncols; i++) { cols[i] = find_column(tab, st->Col[i].s); if (cols[i] == -1) { - db_d_append_error(_("Column '%s' not found"), st->Col[i].s); + db_d_append_error(_("Column <%s> not found."), + st->Col[i].s); return DB_FAILED; } } @@ -178,7 +179,7 @@ int execute(char *sql, cursor *c) case (SQLP_CREATE): if (tab >= 0) { - db_d_append_error(_("Table %s already exists"), st->table); + db_d_append_error(_("Table <%s> already exists."), st->table); return DB_FAILED; } @@ -1019,7 +1020,7 @@ int eval_node_type(SQLPNODE *nptr, int tab) case SQLP_NODE_COLUMN: ccol = find_column(tab, nptr->column_name); if (ccol == -1) { - db_d_append_error(_("Column '%s' not found"), nptr->column_name); + db_d_append_error(_("Column <%s> not found."), nptr->column_name); return -1; } col = &(db.tables[tab].cols[ccol]); diff --git a/db/drivers/dbf/describe.c b/db/drivers/dbf/describe.c index 7790f3745f2..e51e9227826 100644 --- a/db/drivers/dbf/describe.c +++ b/db/drivers/dbf/describe.c @@ -27,7 +27,7 @@ int db__driver_describe_table(dbString *table_name, dbTable **table) tab = find_table(name); if (tab == -1) { - db_d_append_error(_("Table '%s' doesn't exist"), + db_d_append_error(_("Table <%s> does not exist."), db_get_string(table_name)); db_d_report_error(); return DB_FAILED; diff --git a/db/drivers/mysql/describe.c b/db/drivers/mysql/describe.c index f2667a1f07b..3228a231e1c 100644 --- a/db/drivers/mysql/describe.c +++ b/db/drivers/mysql/describe.c @@ -40,7 +40,7 @@ int db__driver_describe_table(dbString *table_name, dbTable **table) } if (describe_table(res, table, NULL) == DB_FAILED) { - db_d_append_error(_("Unable to describe table")); + db_d_append_error(_("Unable to describe table.")); db_d_report_error(); mysql_free_result(res); return DB_FAILED; diff --git a/db/drivers/odbc/cursor.c b/db/drivers/odbc/cursor.c index 804e3466984..e6bcdcf00e3 100644 --- a/db/drivers/odbc/cursor.c +++ b/db/drivers/odbc/cursor.c @@ -31,7 +31,7 @@ cursor *alloc_cursor(void) /* allocate the cursor */ c = (cursor *)db_malloc(sizeof(cursor)); if (c == NULL) { - db_d_append_error(_("Unable to allocate cursor")); + db_d_append_error(_("Unable to allocate cursor.")); db_d_report_error(); return c; } diff --git a/db/drivers/odbc/table.c b/db/drivers/odbc/table.c index 437068c8f4b..567ff6d13a3 100644 --- a/db/drivers/odbc/table.c +++ b/db/drivers/odbc/table.c @@ -151,7 +151,7 @@ int db__driver_drop_table(dbString *name) } if (nrow == 0) { - db_d_append_error(_("Table %s doesn't exist"), tname); + db_d_append_error(_("Table <%s> does not exist."), tname); db_d_report_error(); return DB_FAILED; diff --git a/db/drivers/ogr/cursor.c b/db/drivers/ogr/cursor.c index 210f08d3b17..3ba9534f1a7 100644 --- a/db/drivers/ogr/cursor.c +++ b/db/drivers/ogr/cursor.c @@ -61,7 +61,7 @@ cursor *alloc_cursor(void) /* allocate the cursor */ c = (cursor *)db_malloc(sizeof(cursor)); if (c == NULL) { - db_d_append_error(_("Unable to allocate cursor")); + db_d_append_error(_("Unable to allocate cursor.")); return NULL; } @@ -70,7 +70,7 @@ cursor *alloc_cursor(void) /* tokenize it */ c->token = db_new_token(c); if (c->token < 0) { - db_d_append_error(_("Unable to add new token")); + db_d_append_error(_("Unable to add new token.")); return NULL; } return c; diff --git a/db/drivers/postgres/listdb.c b/db/drivers/postgres/listdb.c index 974141f1e36..8094a3266d5 100644 --- a/db/drivers/postgres/listdb.c +++ b/db/drivers/postgres/listdb.c @@ -82,7 +82,7 @@ int db__driver_list_databases(dbString *dbpath, int npaths, dbHandle **dblist, list = db_alloc_handle_array(rec_num); if (list == NULL) { - db_d_append_error(_("Out of memory")); + db_d_append_error(_("Out of memory.")); db_d_report_error(); return DB_FAILED; } diff --git a/db/drivers/postgres/listtab.c b/db/drivers/postgres/listtab.c index 46cee961eea..740ca556df7 100644 --- a/db/drivers/postgres/listtab.c +++ b/db/drivers/postgres/listtab.c @@ -87,7 +87,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) list = db_alloc_string_array(nrows); if (list == NULL) { - db_d_append_error(_("Out of memory")); + db_d_append_error(_("Out of memory.")); db_d_report_error(); return DB_FAILED; } diff --git a/db/drivers/postgres/select.c b/db/drivers/postgres/select.c index 4b4843535a9..cc6a013ab33 100644 --- a/db/drivers/postgres/select.c +++ b/db/drivers/postgres/select.c @@ -64,7 +64,7 @@ int db__driver_open_select_cursor(dbString *sel, dbCursor *dbc, int mode) G_free(str); if (describe_table(c->res, &table, c) == DB_FAILED) { - db_d_append_error(_("Unable to describe table")); + db_d_append_error(_("Unable to describe table.")); db_d_report_error(); PQclear(res); return DB_FAILED; diff --git a/db/drivers/sqlite/listdb.c b/db/drivers/sqlite/listdb.c index 52815407ced..4917aaa375a 100644 --- a/db/drivers/sqlite/listdb.c +++ b/db/drivers/sqlite/listdb.c @@ -95,7 +95,7 @@ int listdb(dbString *path, int npaths, dbHandle **handles, int *count) /* count number of dbs */ dirp = opendir(db_get_string(path)); if (dirp == NULL) { - db_d_append_error(_("Unable to open directory '%s'"), + db_d_append_error(_("Unable to open directory '%s'."), db_get_string(path)); db_d_report_error(); return DB_FAILED; @@ -132,7 +132,7 @@ int listdb(dbString *path, int npaths, dbHandle **handles, int *count) /* allocate handles */ hlist = db_alloc_handle_array(hcount); if (hlist == NULL) { - db_d_append_error(_("Out of memory")); + db_d_append_error(_("Out of memory.")); db_d_report_error(); freedb(dlist, hcount); diff --git a/display/d.extract/main.c b/display/d.extract/main.c index 13c325ea3f4..940a26efc35 100644 --- a/display/d.extract/main.c +++ b/display/d.extract/main.c @@ -94,10 +94,10 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&In, input->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), input->answer); if (Vect_open_new(&Out, output->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); Vect_copy_head_data(&In, &Out); Vect_hist_copy(&In, &Out); diff --git a/display/d.grid/main.c b/display/d.grid/main.c index 38f29f14dfc..578696c5d72 100644 --- a/display/d.grid/main.c +++ b/display/d.grid/main.c @@ -248,13 +248,14 @@ int main(int argc, char **argv) /* get grid easting start */ if (!G_scan_easting(opt3->answers[0], &east, G_projection())) { G_usage(); - G_fatal_error(_("Illegal east coordinate <%s>"), opt3->answers[0]); + G_fatal_error(_("Illegal east coordinate <%s>."), opt3->answers[0]); } /* get grid northing start */ if (!G_scan_northing(opt3->answers[1], &north, G_projection())) { G_usage(); - G_fatal_error(_("Illegal north coordinate <%s>"), opt3->answers[1]); + G_fatal_error(_("Illegal north coordinate <%s>."), + opt3->answers[1]); } } diff --git a/display/d.grid/plot.c b/display/d.grid/plot.c index cfa292c62e0..cb45c614228 100644 --- a/display/d.grid/plot.c +++ b/display/d.grid/plot.c @@ -288,7 +288,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, e2 = e1 + ((east - west) / SEGS); if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e1, n1, &lon, &lat, 1, window, info_in, info_out, info_trans); @@ -296,7 +296,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, n1 = lat; if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e2, &n2, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e2, n2, &lon, &lat, 1, window, info_in, info_out, info_trans); @@ -339,7 +339,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, */ if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e1, n1, &lon, &lat, 2, window, info_in, info_out, info_trans); @@ -347,7 +347,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, n1 = lat; if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e2, &n2, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e2, n2, &lon, &lat, 2, window, info_in, info_out, info_trans); @@ -440,7 +440,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, e2 = e1 + ((east - west) / SEGS); if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e1, n1, &lon, &lat, 1, window, info_in, info_out, info_trans); @@ -448,7 +448,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, n1 = lat; if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e2, &n2, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e2, n2, &lon, &lat, 1, window, info_in, info_out, info_trans); @@ -501,7 +501,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e1, n1, &lon, &lat, 2, window, info_in, info_out, info_trans); @@ -509,7 +509,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, n1 = lat; if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e2, &n2, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e2, n2, &lon, &lat, 2, window, info_in, info_out, info_trans); @@ -651,7 +651,7 @@ void get_ll_bounds(double *w, double *e, double *s, double *n, n1 = window.north; if (GPJ_transform(info_in, info_out, info_trans, PJ_FWD, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); if (!first) { north = n1; first = 1; @@ -668,7 +668,7 @@ void get_ll_bounds(double *w, double *e, double *s, double *n, s1 = window.south; if (GPJ_transform(info_in, info_out, info_trans, PJ_FWD, &e1, &s1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); if (!first) { south = s1; first = 1; @@ -686,7 +686,7 @@ void get_ll_bounds(double *w, double *e, double *s, double *n, n1 = ns; if (GPJ_transform(info_in, info_out, info_trans, PJ_FWD, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); if (!first) { east = e1; first = 1; @@ -704,7 +704,7 @@ void get_ll_bounds(double *w, double *e, double *s, double *n, n1 = ns; if (GPJ_transform(info_in, info_out, info_trans, PJ_FWD, &w1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); if (!first) { west = w1; first = 1; @@ -758,19 +758,19 @@ void check_coords(double e, double n, double *lon, double *lat, int par, /* convert original coords to ll */ if (GPJ_transform(info_in, info_out, info_trans, PJ_FWD, &e, &n, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); if (par == 1) { /* lines of latitude -- const. northing */ /* convert correct UTM to ll */ if (GPJ_transform(info_in, info_out, info_trans, PJ_FWD, &x, &y, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); /* convert new ll back to coords */ if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &x, &n, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); *lat = n; *lon = x; @@ -780,12 +780,12 @@ void check_coords(double e, double n, double *lon, double *lat, int par, /* convert correct UTM to ll */ if (GPJ_transform(info_in, info_out, info_trans, PJ_FWD, &x, &y, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); /* convert new ll back to coords */ if (GPJ_transform(info_in, info_out, info_trans, PJ_INV, &e, &y, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); *lat = y; *lon = e; diff --git a/display/d.legend.vect/draw.c b/display/d.legend.vect/draw.c index 9d773da0278..82f61fb6f46 100644 --- a/display/d.legend.vect/draw.c +++ b/display/d.legend.vect/draw.c @@ -74,7 +74,7 @@ void draw(char *file_name, double LL, double LT, char *title, int cols, snprintf(sub_delim, sizeof(GNAME_MAX), "%s%s%s%s%s%s", sep, sep, sep, sep, sep, sep); if (!file_in) - G_fatal_error(_("Unable to open input file <%s>"), file_name); + G_fatal_error(_("Unable to open input file '%s'."), file_name); /* Get number of legend row(item) and the biggest symbol */ item_count = 0; diff --git a/display/d.legend.vect/main.c b/display/d.legend.vect/main.c index fc7a233f8eb..2e6bc37ff5b 100644 --- a/display/d.legend.vect/main.c +++ b/display/d.legend.vect/main.c @@ -260,7 +260,7 @@ int main(int argc, char **argv) if (strcmp(opt_output->answer, "-") == 0) { source = fopen(file_name, "r"); if (!source) - G_fatal_error(_("Unable to open input file <%s>"), file_name); + G_fatal_error(_("Unable to open input file '%s'."), file_name); while ((nread = fread(buf, 1, sizeof(buf), source))) fwrite(buf, 1, nread, stdout); fclose(source); diff --git a/display/d.linegraph/main.c b/display/d.linegraph/main.c index c5e41f8b4cb..0e258f23648 100644 --- a/display/d.linegraph/main.c +++ b/display/d.linegraph/main.c @@ -403,7 +403,7 @@ int main(int argc, char **argv) snprintf(in[0].name, sizeof(in[0].name), "%s", x_opt->answer); if ((in[0].fp = fopen(in[0].full_name, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), in[0].full_name); + G_fatal_error(_("Unable to open input file '%s'."), in[0].full_name); num_y_files = 0; @@ -421,7 +421,8 @@ int main(int argc, char **argv) snprintf(in[j].name, sizeof(in[j].name), "%s", name); if ((in[j].fp = fopen(in[j].full_name, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), in[j].full_name); + G_fatal_error(_("Unable to open input file '%s'."), + in[j].full_name); num_y_files++; if (num_y_files > 10) @@ -720,7 +721,8 @@ int main(int argc, char **argv) for (i = 0; i <= num_y_files; i++) { if ((in[i].fp = fopen(in[i].full_name, "r")) == NULL) { D_close_driver(); - G_fatal_error(_("Unable to open input file <%s>"), in[i].full_name); + G_fatal_error(_("Unable to open input file '%s'."), + in[i].full_name); } } diff --git a/display/d.mon/list.c b/display/d.mon/list.c index 9b23f877b4d..a6cc751f161 100644 --- a/display/d.mon/list.c +++ b/display/d.mon/list.c @@ -125,7 +125,7 @@ void list_cmd(const char *name, FILE *fd_out) G_file_name(cmd_file, mon_path, "cmd", G_mapset()); fd = fopen(cmd_file, "r"); if (!fd) - G_fatal_error(_("Unable to open file '%s'"), cmd_file); + G_fatal_error(_("Unable to open file '%s'."), cmd_file); while (G_getl2(buf, sizeof(buf) - 1, fd) != 0) { fprintf(fd_out, "%s\n", buf); diff --git a/display/d.mon/start.c b/display/d.mon/start.c index 2d741db0bf7..2bdd22159c5 100644 --- a/display/d.mon/start.c +++ b/display/d.mon/start.c @@ -46,7 +46,8 @@ char *start(const char *name, const char *output, int width, int height, } if (!update && access(output_name, F_OK) == 0) { if (G_get_overwrite()) { - G_warning(_("File <%s> already exists and will be overwritten"), + G_warning(_("File '%s' already exists and will be " + "overwritten."), output_name); D_setup_unity(0); D_erase("white"); @@ -75,10 +76,11 @@ char *start(const char *name, const char *output, int width, int height, /* check if file exists */ if (!update && access(output_name, F_OK) == 0) { if (G_get_overwrite()) { - G_warning(_("File <%s> already exists and will be overwritten"), + G_warning(_("File '%s' already exists and will be " + "overwritten."), output_name); if (0 != unlink(output_name)) - G_fatal_error(_("Unable to delete <%s>"), output_name); + G_fatal_error(_("Unable to delete <%s>."), output_name); } } } diff --git a/display/d.mon/stop.c b/display/d.mon/stop.c index f407ef1d18b..5a1f7aa0c3d 100644 --- a/display/d.mon/stop.c +++ b/display/d.mon/stop.c @@ -38,7 +38,7 @@ int stop(const char *name) continue; snprintf(file_path, sizeof(file_path), "%s/%s", mon_path, dp->d_name); if (unlink(file_path) == -1) - G_warning(_("Unable to delete file <%s>"), file_path); + G_warning(_("Unable to delete file '%s'."), file_path); } closedir(dirp); @@ -63,7 +63,7 @@ int stop_wx(const char *name) fp = fopen(pid_file, "r"); if (!fp) { - G_warning(_("Unable to open file <%s>"), pid_file); + G_warning(_("Unable to open file '%s'."), pid_file); return 1; } pid = NULL; @@ -72,7 +72,7 @@ int stop_wx(const char *name) fclose(fp); if (!pid) { - G_warning(_("Unable to read file <%s>"), pid_file); + G_warning(_("Unable to read file '%s'."), pid_file); return 1; } diff --git a/display/d.path/main.c b/display/d.path/main.c index 25f75faa782..e69bebd58d3 100644 --- a/display/d.path/main.c +++ b/display/d.path/main.c @@ -183,7 +183,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&Map, map->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map->answer); D_setup(0); diff --git a/display/d.profile/main.c b/display/d.profile/main.c index 06c1a801393..0c8d4210b52 100644 --- a/display/d.profile/main.c +++ b/display/d.profile/main.c @@ -70,7 +70,7 @@ static void get_map_range(void) struct FPRange fprange; if (Rast_read_fp_range(mapname, "", &fprange) <= 0) - G_fatal_error(_("Unable to read FP range for %s"), mapname); + G_fatal_error(_("Unable to read FP range for <%s>."), mapname); Rast_get_fp_range_min_max(&fprange, &min, &max); } diff --git a/display/d.text/main.c b/display/d.text/main.c index 669e6d40df7..90a5568cae0 100644 --- a/display/d.text/main.c +++ b/display/d.text/main.c @@ -362,7 +362,7 @@ int main(int argc, char **argv) else { cmd_fp = fopen(opt.input->answer, "r"); if (!cmd_fp) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), opt.input->answer); } diff --git a/display/d.vect.chart/main.c b/display/d.vect.chart/main.c index 80a0f326e15..b93923421e0 100644 --- a/display/d.vect.chart/main.c +++ b/display/d.vect.chart/main.c @@ -328,7 +328,7 @@ int main(int argc, char **argv) /* open vector */ Vect_set_open_level(2); if (Vect_open_old(&Map, map_opt->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_opt->answer); ctype = CTYPE_PIE; if (ctype_opt->answer[0] == 'b') diff --git a/display/d.vect.chart/plot.c b/display/d.vect.chart/plot.c index b8e4edd0bad..1ec8173cb2a 100644 --- a/display/d.vect.chart/plot.c +++ b/display/d.vect.chart/plot.c @@ -31,7 +31,8 @@ int plot(int ctype, struct Map_info *Map, int type, int field, char *columns, Fi = Vect_get_field(Map, field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), field); + G_fatal_error(_("Database connection not defined for layer %d."), + field); /* Open driver */ driver = db_start_driver_open_database(Fi->driver, Fi->database); @@ -81,7 +82,7 @@ int plot(int ctype, struct Map_info *Map, int type, int field, char *columns, if (db_open_select_cursor(driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: '%s'"), buf); + G_warning(_("Unable to open select cursor: '%s'."), buf); return 1; } diff --git a/display/d.vect.thematic/main.c b/display/d.vect.thematic/main.c index 083289352e8..a55b4a21483 100644 --- a/display/d.vect.thematic/main.c +++ b/display/d.vect.thematic/main.c @@ -368,7 +368,7 @@ int main(int argc, char **argv) has_color = 0; } else if (ret == 0) { /* error */ - G_fatal_error(_("Unknown color: [%s]"), bcolor_opt->answer); + G_fatal_error(_("Unknown color: <%s>."), bcolor_opt->answer); } /* if both class breaks and (algorithm or classnumber) are given, give @@ -448,7 +448,7 @@ int main(int argc, char **argv) D_setup(0); if (verbose) - G_message(_("Plotting ...")); + G_message(_("Plotting...")); overlap = 1; Vect_get_map_box(&Map, &box); diff --git a/display/d.vect.thematic/plot1.c b/display/d.vect.thematic/plot1.c index affc6215582..dd7d15278ac 100644 --- a/display/d.vect.thematic/plot1.c +++ b/display/d.vect.thematic/plot1.c @@ -105,7 +105,7 @@ int plot1(struct Map_info *Map, int type, int area G_UNUSED, if (open_db) { fi = Vect_get_field(Map, (Clist->field > 0 ? Clist->field : 1)); if (fi == NULL) { - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), (Clist->field > 0 ? Clist->field : 1)); } @@ -159,7 +159,7 @@ int plot1(struct Map_info *Map, int type, int area G_UNUSED, if (cvarr_width.ctype != DB_C_TYPE_INT && cvarr_width.ctype != DB_C_TYPE_DOUBLE) - G_fatal_error(_("Line width column (%s) not a number."), + G_fatal_error(_("Line width column <%s> not a number."), width_column); if (nrec_width < 0) diff --git a/display/d.vect/attr.c b/display/d.vect/attr.c index 59d9a934eba..83ca588ae09 100644 --- a/display/d.vect/attr.c +++ b/display/d.vect/attr.c @@ -108,7 +108,7 @@ int display_attr(struct Map_info *Map, int type, char *attrcol, if (db_open_select_cursor(driver, &stmt, &cursor, DB_SEQUENTIAL) != DB_OK) - G_fatal_error(_("Unable to open select cursor: '%s'"), + G_fatal_error(_("Unable to open select cursor: '%s'."), db_get_string(&stmt)); nrows = db_get_num_rows(&cursor); diff --git a/display/d.vect/main.c b/display/d.vect/main.c index 81b8a608792..44e63226e9b 100644 --- a/display/d.vect/main.c +++ b/display/d.vect/main.c @@ -345,7 +345,7 @@ int main(int argc, char **argv) if (reg < minreg) { G_important_message( - _("Region size is lower than minreg, nothing displayed")); + _("Region size is lower than minreg, nothing displayed.")); exit(EXIT_SUCCESS); } } @@ -354,7 +354,7 @@ int main(int argc, char **argv) if (reg > maxreg) { G_important_message( - _("Region size is greater than maxreg, nothing displayed")); + _("Region size is greater than maxreg, nothing displayed.")); exit(EXIT_SUCCESS); } } @@ -395,13 +395,13 @@ int main(int argc, char **argv) chcat = 0; if (where_opt->answer) { if (Clist->field < 1) - G_fatal_error(_("Option <%s> must be > 0"), field_opt->key); + G_fatal_error(_("Option <%s> must be > 0."), field_opt->key); chcat = 1; option_to_where(&Map, Clist, where_opt->answer); } else if (cat_opt->answer) { if (Clist->field < 1 && !id_flag->answer) - G_fatal_error(_("Option <%s> must be > 0"), field_opt->key); + G_fatal_error(_("Option <%s> must be > 0."), field_opt->key); chcat = 1; ret = Vect_str_to_cat_list(cat_opt->answer, Clist); if (ret > 0) @@ -436,7 +436,7 @@ int main(int argc, char **argv) if (overlap == 0) { G_warning( _("The bounding box of the map is outside the current region, " - "nothing drawn")); + "nothing drawn.")); } else { if (overlap < 1) diff --git a/display/d.vect/opt.c b/display/d.vect/opt.c index 450a5614e3f..500e5e0ea04 100644 --- a/display/d.vect/opt.c +++ b/display/d.vect/opt.c @@ -123,7 +123,7 @@ int option_to_color(struct color_rgb *color, const char *color_val) has_color = 0; } else if (ret == 0) { /* error */ - G_fatal_error(_("Unknown color: '%s'"), color_val); + G_fatal_error(_("Unknown color: <%s>."), color_val); } return has_color; diff --git a/display/d.vect/shape.c b/display/d.vect/shape.c index 1232490dccd..6c56f8815a4 100644 --- a/display/d.vect/shape.c +++ b/display/d.vect/shape.c @@ -38,7 +38,7 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist, field = Clist->field > 0 ? Clist->field : 1; fi = Vect_get_field(Map, field); if (!fi) { - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), field); } @@ -87,7 +87,7 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist, } if (width_column) { if (*width_column == '\0') - G_fatal_error(_("Line width column not specified")); + G_fatal_error(_("Line width column not specified.")); db_CatValArray_init(&cvarr_width); @@ -98,7 +98,7 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist, if (cvarr_width.ctype != DB_C_TYPE_INT && cvarr_width.ctype != DB_C_TYPE_DOUBLE) - G_fatal_error(_("Line width column ('%s') not a number"), + G_fatal_error(_("Line width column <%s> not a number."), width_column); if (nrec_width < 0) diff --git a/display/d.where/main.c b/display/d.where/main.c index 4e22c523085..ce8c10e4d00 100644 --- a/display/d.where/main.c +++ b/display/d.where/main.c @@ -151,7 +151,7 @@ int main(int argc, char **argv) else { fp = fopen(file->answer, "r"); if (!fp) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), file->answer); } } diff --git a/display/d.where/where.c b/display/d.where/where.c index 9f775f14dd0..fc798a321d7 100644 --- a/display/d.where/where.c +++ b/display/d.where/where.c @@ -61,7 +61,7 @@ int where_am_i(char **coords, FILE *fp, int have_spheroid, int decimal, if (GPJ_transform(&iproj, &oproj, &tproj, PJ_FWD, &lon, &lat, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform()")); + G_fatal_error(_("Error in GPJ_transform().")); if (decimal) { G_format_easting(lon, buf1, 0); diff --git a/doc/examples/raster/r.example/main.c b/doc/examples/raster/r.example/main.c index 199e932a24f..adcf51ad9cf 100644 --- a/doc/examples/raster/r.example/main.c +++ b/doc/examples/raster/r.example/main.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) * mapset name otherwise */ mapset = (char *)G_find_raster2(name, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); /* determine the inputmap type (CELL/FCELL/DCELL) */ data_type = Rast_map_type(name, mapset); diff --git a/doc/examples/vector/v.example/main.c b/doc/examples/vector/v.example/main.c index ff48cbd3ede..7a167587dc2 100644 --- a/doc/examples/vector/v.example/main.c +++ b/doc/examples/vector/v.example/main.c @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) lib/vector/Vlib/open.c */ if (1 > Vect_open_old(&In, old->answer, mapset)) - G_fatal_error(_("Unable to open vector map <%s>"), old->answer); + G_fatal_error(_("Unable to open vector map <%s>."), old->answer); /* Check if old vector is 3D. We should preserve 3D data. */ if (Vect_is_3d(&In)) @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) /* Open new vector for reading/writing */ if (0 > Vect_open_new(&Out, new->answer, open3d)) { - G_fatal_error(_("Unable to create vector map <%s>"), new->answer); + G_fatal_error(_("Unable to create vector map <%s>."), new->answer); } /* Set error handler for output vector map */ @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) /* Let's get vector layers db connections information */ Fi = Vect_get_field(&In, 1); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer %d"), 1); + G_fatal_error(_("Database connection not defined for layer %d."), 1); } /* Output information useful for debugging diff --git a/general/g.cairocomp/main.c b/general/g.cairocomp/main.c index d713ab443c5..09d5947a558 100644 --- a/general/g.cairocomp/main.c +++ b/general/g.cairocomp/main.c @@ -41,7 +41,7 @@ static XID read_xid(const char *filename) fp = fopen(filename, "r"); if (!fp) - G_fatal_error(_("Unable to open input file <%s>"), filename); + G_fatal_error(_("Unable to open input file '%s'."), filename); if (!fgets(buf, sizeof(buf), fp)) G_fatal_error(_("Unable to read input file <%s>"), filename); @@ -61,7 +61,7 @@ static void write_xid(const char *filename, XID xid) fp = fopen(filename, "w"); if (!fp) - G_fatal_error(_("Unable to open output file <%s>"), filename); + G_fatal_error(_("Unable to open output file '%s'."), filename); snprintf(buf, sizeof(buf), "0x%08lx\n", (unsigned long)xid); diff --git a/general/g.list/main.c b/general/g.list/main.c index f398bec0966..683ad6a6d6c 100644 --- a/general/g.list/main.c +++ b/general/g.list/main.c @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) flag.full->label = _("Verbose listing (also list map titles) [deprecated]"); flag.full->description = _("This flag is deprecated and will be removed in a future release. " - " Use the type-specific tool to obtain metadata, such as r.info " + "Use the type-specific tool to obtain metadata, such as r.info " "and v.info."); flag.full->guisection = _("Print"); @@ -335,7 +335,7 @@ int main(int argc, char *argv[]) else if (strcmp(mapset, ".") == 0) mapset = G_mapset(); else if (G_mapset_permissions(mapset) == -1) - G_fatal_error(_("Mapset <%s> does not exist"), mapset); + G_fatal_error(_("Mapset <%s> does not exist."), mapset); G_add_mapset_to_search_path(mapset); } } diff --git a/general/g.mkfontcap/freetype_fonts.c b/general/g.mkfontcap/freetype_fonts.c index 88b16dcea8b..27d57cf3efa 100644 --- a/general/g.mkfontcap/freetype_fonts.c +++ b/general/g.mkfontcap/freetype_fonts.c @@ -48,7 +48,7 @@ void find_freetype_fonts(void) int i; if (FT_Init_FreeType(&ftlibrary) != 0) - G_fatal_error(_("Unable to initialise Freetype")); + G_fatal_error(_("Unable to initialise FreeType.")); for (i = 0; i < numsearchdirs; i++) find_fonts(searchdirs[i]); diff --git a/general/g.pnmcomp/main.c b/general/g.pnmcomp/main.c index f40c89f9931..c47dce6d61f 100644 --- a/general/g.pnmcomp/main.c +++ b/general/g.pnmcomp/main.c @@ -91,7 +91,7 @@ static void read_pnm(const char *filename, unsigned char *buf, fp = fopen(filename, "rb"); if (!fp) - G_fatal_error(_("File <%s> not found"), filename); + G_fatal_error(_("File '%s' not found."), filename); read_header(fp, &magic, &maxval); @@ -237,7 +237,7 @@ static void write_ppm(const char *filename, const unsigned char *buf) fp = fopen(filename, "wb"); if (!fp) - G_fatal_error(_("Unable to open file <%s>"), filename); + G_fatal_error(_("Unable to open file '%s'."), filename); fprintf(fp, "P6\n%d %d\n255\n", width, height); @@ -254,7 +254,7 @@ static void write_pgm(const char *filename, const unsigned char *buf) fp = fopen(filename, "wb"); if (!fp) - G_fatal_error(_("Unable to open file <%s>"), filename); + G_fatal_error(_("Unable to open file '%s'."), filename); fprintf(fp, "P5\n%d %d\n255\n", width, height); diff --git a/general/g.ppmtopng/main.c b/general/g.ppmtopng/main.c index aa8688556f7..fe8f25bdfa0 100644 --- a/general/g.ppmtopng/main.c +++ b/general/g.ppmtopng/main.c @@ -30,7 +30,7 @@ static void read_ppm(const char *filename) input = fopen(filename, "rb"); if (!input) - G_fatal_error(_("Unable to open input file %s"), filename); + G_fatal_error(_("Unable to open input file '%s'."), filename); if (fscanf(input, "P6 %d %d %d", &width, &height, &maxval) != 3) G_fatal_error(_("Invalid input file %s"), filename); @@ -78,7 +78,7 @@ static void write_png(const char *filename) output = fopen(filename, "wb"); if (!output) - G_fatal_error(_("Unable to open output file %s"), filename); + G_fatal_error(_("Unable to open output file '%s'."), filename); png_init_io(png_ptr, output); diff --git a/general/g.proj/create.c b/general/g.proj/create.c index c2c693f7aa1..69c3a9fd4fd 100644 --- a/general/g.proj/create.c +++ b/general/g.proj/create.c @@ -22,7 +22,7 @@ void create_location(const char *location) strerror(errno)); else /* Shouldn't happen */ - G_fatal_error(_("Unable to create project <%s>"), location); + G_fatal_error(_("Unable to create new project <%s>."), location); G_message(_("You can switch to the new project by\n`%s=%s`"), "g.mapset mapset=PERMANENT project", location); diff --git a/general/g.proj/input.c b/general/g.proj/input.c index d7abda38df2..5701fe214eb 100644 --- a/general/g.proj/input.c +++ b/general/g.proj/input.c @@ -124,7 +124,7 @@ int input_wkt(char *wktfile) G_squeeze(buff); } else - G_fatal_error(_("Unable to open file '%s' for reading"), wktfile); + G_fatal_error(_("Unable to open file '%s' for reading."), wktfile); projwkt = G_store(buff); diff --git a/general/g.proj/main.c b/general/g.proj/main.c index 2a610b134f5..9b245b7180a 100644 --- a/general/g.proj/main.c +++ b/general/g.proj/main.c @@ -255,24 +255,24 @@ int main(int argc, char *argv[]) } if (shellinfo->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); outputFormat = SHELL; } else if (printproj4->answer) { - G_verbose_message( - _("Flag 'j' is deprecated and will be removed in a future " - "release. Please use format=proj4 instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'j', "proj4"); outputFormat = PROJ4; } else if (printwkt->answer || esristyle->answer) { outputFormat = WKT; if (printwkt->answer) { - G_verbose_message( - _("Flag 'w' is deprecated and will be removed in a future " - "release. Please use format=wkt instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed " + "in a future release. Use format=%s instead."), + 'w', "wkt"); } } diff --git a/general/g.region/main.c b/general/g.region/main.c index ea61c7d5b43..5fa30c8c80e 100644 --- a/general/g.region/main.c +++ b/general/g.region/main.c @@ -420,9 +420,9 @@ int main(int argc, char *argv[]) if (flag.gprint->answer) { print_flag |= PRINT_SH; - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); } if (flag.lprint->answer) @@ -506,7 +506,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("Raster map name too long: <%s>"), *rast_ptr); mapset = G_find_raster2(rast_name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), rast_name); + G_fatal_error(_("Raster map <%s> not found."), rast_name); Rast_get_cellhd(rast_name, mapset, &temp_window); if (!first) { window = temp_window; @@ -536,7 +536,7 @@ int main(int argc, char *argv[]) update_file = true; if ((mapset = G_find_raster3d(name, "")) == NULL) - G_fatal_error(_("3D raster map <%s> not found"), name); + G_fatal_error(_("3D raster map <%s> not found."), name); if (Rast3d_read_region_map(name, mapset, &win) < 0) G_fatal_error(_("Unable to read header of 3D raster map <%s@%s>"), @@ -573,7 +573,7 @@ int main(int argc, char *argv[]) Vect_close(&Map); Vect_set_open_level(1); /* no topology */ if (Vect_open_old(&Map, vect_name, mapset) < 1) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), vect_name); } @@ -894,7 +894,7 @@ int main(int argc, char *argv[]) update_file = true; mapset = G_find_raster2(name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); zoom(&window, name, mapset); } @@ -903,7 +903,7 @@ int main(int argc, char *argv[]) update_file = true; mapset = G_find_raster2(name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); Rast_get_cellhd(name, mapset, &temp_window); Rast_align_window(&window, &temp_window); } diff --git a/general/g.version/main.c b/general/g.version/main.c index 6504b24338f..b4d50d20139 100644 --- a/general/g.version/main.c +++ b/general/g.version/main.c @@ -140,9 +140,9 @@ int main(int argc, char *argv[]) } if (shell->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON) { G_json_value_free(root_value); G_fatal_error(_("Cannot use the -g flag with format=json; " diff --git a/general/manage/lister/vector.c b/general/manage/lister/vector.c index 0f84aa79a50..e630f78f3ac 100644 --- a/general/manage/lister/vector.c +++ b/general/manage/lister/vector.c @@ -29,7 +29,7 @@ static int lister(const char *name, const char *mapset, char *title) *title = 0; if (*name) { if (Vect_open_old_head(&Map, name, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), name); + G_fatal_error(_("Unable to open vector map <%s>."), name); strcpy(title, Vect_get_map_name(&Map)); Vect_close(&Map); } diff --git a/gui/wxpython/animation/data.py b/gui/wxpython/animation/data.py index 8dbb3a5d502..5be4eedf9bc 100644 --- a/gui/wxpython/animation/data.py +++ b/gui/wxpython/animation/data.py @@ -133,7 +133,7 @@ def SetWorkspaceFile(self, fileName): raise ValueError(_("No workspace file selected.")) if not Path(fileName).exists(): - raise OSError(_("File %s not found") % fileName) + raise OSError(_("File '%s' not found.") % fileName) self._workspaceFile = fileName self.nvizTask.Load(self.workspaceFile) diff --git a/gui/wxpython/animation/dialogs.py b/gui/wxpython/animation/dialogs.py index 488f4fd2093..fbb225c3232 100644 --- a/gui/wxpython/animation/dialogs.py +++ b/gui/wxpython/animation/dialogs.py @@ -1444,7 +1444,8 @@ def OnExport(self, event): if not Path(decor["file"]).exists(): if decor["file"]: GError( - parent=self, message=_("File %s not found.") % decor["file"] + parent=self, + message=_("File '%s' not found.") % decor["file"], ) else: GError( diff --git a/gui/wxpython/core/render.py b/gui/wxpython/core/render.py index 1997dcf7ae9..79baac694b7 100644 --- a/gui/wxpython/core/render.py +++ b/gui/wxpython/core/render.py @@ -279,7 +279,7 @@ def IsRendered(self) -> bool: def SetType(self, ltype): """Set layer type""" if ltype not in list(utils.command2ltype.values()) + ["overlay", "command"]: - raise GException(_("Unsupported map layer type '%s'") % ltype) + raise GException(_("Unsupported map layer type <%s>.") % ltype) if not self.renderMgr: env = {} diff --git a/gui/wxpython/core/workspace.py b/gui/wxpython/core/workspace.py index 952e3742d8c..978b67285b5 100644 --- a/gui/wxpython/core/workspace.py +++ b/gui/wxpython/core/workspace.py @@ -1736,7 +1736,7 @@ def read(self, parent): except OSError: wx.MessageBox( parent=parent, - message=_("Unable to open file <%s> for reading.") % self.filename, + message=_("Unable to open file '%s' for reading.") % self.filename, caption=_("Error"), style=wx.OK | wx.ICON_ERROR, ) diff --git a/gui/wxpython/gmodeler/model.py b/gui/wxpython/gmodeler/model.py index 4fbcaedc49e..e6ffc3fdec7 100644 --- a/gui/wxpython/gmodeler/model.py +++ b/gui/wxpython/gmodeler/model.py @@ -509,7 +509,7 @@ def Validate(self): report = False break if report: - errList.append(cmd[0] + ": " + _("undefined variable '%s'") % var) + errList.append(cmd[0] + ": " + _("Undefined variable <%s>.") % var) # TODO: check variables in file only optionally # errList += self._substituteFile(action, checkOnly = True) @@ -573,7 +573,7 @@ def _substituteFile(self, item, params=None, checkOnly=False): s[2:-1] if s.startswith("%{") else s[1:] ) # strip curly braces only if present cmd = item.GetLog(string=False)[0] - errList.append(cmd + ": " + _("undefined variable '%s'") % var) + errList.append(cmd + ": " + _("Undefined variable <%s>.") % var) if not checkOnly: if write: diff --git a/gui/wxpython/gmodeler/panels.py b/gui/wxpython/gmodeler/panels.py index 1df05cb312c..34381bc6f95 100644 --- a/gui/wxpython/gmodeler/panels.py +++ b/gui/wxpython/gmodeler/panels.py @@ -700,7 +700,7 @@ def WriteModelFile(self, filename): except OSError: wx.MessageBox( parent=self, - message=_("Unable to open file <%s> for writing.") % filename, + message=_("Unable to open file '%s' for writing.") % filename, caption=_("Error"), style=wx.OK | wx.ICON_ERROR | wx.CENTRE, ) diff --git a/gui/wxpython/gui_core/forms.py b/gui/wxpython/gui_core/forms.py index abcc3dc2abd..c23a82da29d 100644 --- a/gui/wxpython/gui_core/forms.py +++ b/gui/wxpython/gui_core/forms.py @@ -1021,7 +1021,7 @@ def OnCopyShellCommand(self, event): # wx.TheClipboard.UsePrimarySelection(True) wx.TheClipboard.SetData(cmddata) wx.TheClipboard.Close() - self.SetStatusText(_("'%s' copied to clipboard") % (cmdstring)) + self.SetStatusText(_("'%s' copied to clipboard.") % (cmdstring)) def OnCopyPython(self, event): """Copy the command in the selected Python API syntax""" @@ -1276,7 +1276,7 @@ def _toClipboard(self, text): if wx.TheClipboard.Open(): wx.TheClipboard.SetData(wx.TextDataObject(text)) wx.TheClipboard.Close() - self.SetStatusText(_("%s copied to clipboard") % text) + self.SetStatusText(_("'%s' copied to clipboard.") % text) def OnCancel(self, event): """Cancel button pressed""" diff --git a/gui/wxpython/gui_core/ghelp.py b/gui/wxpython/gui_core/ghelp.py index da040eb3bba..4bac437b669 100644 --- a/gui/wxpython/gui_core/ghelp.py +++ b/gui/wxpython/gui_core/ghelp.py @@ -652,7 +652,7 @@ def _pageStats(self): self.statswin.SetAutoLayout(True) if not jsStats: - Debug.msg(5, _("File <%s> not found") % fname) + Debug.msg(5, _("File '%s' not found.") % fname) statsSizer = wx.BoxSizer(wx.VERTICAL) statstext = StaticText( self.statswin, id=wx.ID_ANY, label=_("%s file missing") % fname diff --git a/gui/wxpython/iclass/dialogs.py b/gui/wxpython/iclass/dialogs.py index df7ac61edf8..6caad8abe3a 100644 --- a/gui/wxpython/iclass/dialogs.py +++ b/gui/wxpython/iclass/dialogs.py @@ -212,7 +212,7 @@ def GetGroupBandsErr(self, parent): else: GError(_("No data found in group <%s>.\n.") % g, parent=parent) else: - GError(_("Group <%s> not found") % gr, parent=parent) + GError(_("Group <%s> not found.") % gr, parent=parent) return bands diff --git a/gui/wxpython/iclass/frame.py b/gui/wxpython/iclass/frame.py index 2f5842deb56..26806e9ad12 100644 --- a/gui/wxpython/iclass/frame.py +++ b/gui/wxpython/iclass/frame.py @@ -696,7 +696,7 @@ def ImportAreas(self, vector): # open vector map to be imported if digitClass.OpenMap(vector, update=False) is None: - GError(parent=self, message=_("Unable to open vector map <%s>") % vector) + GError(parent=self, message=_("Unable to open vector map <%s>.") % vector) return None # copy features to the temporary map diff --git a/gui/wxpython/iclass/g.gui.iclass.py b/gui/wxpython/iclass/g.gui.iclass.py index e72d6ec8800..92a2e66a1a3 100755 --- a/gui/wxpython/iclass/g.gui.iclass.py +++ b/gui/wxpython/iclass/g.gui.iclass.py @@ -66,7 +66,7 @@ def main(): gs.fatal(_("Name of subgroup required")) group_name = gs.find_file(name=options["group"], element="group")["name"] if not group_name: - gs.fatal(_("Group <%s> not found") % options["group"]) + gs.fatal(_("Group <%s> not found.") % options["group"]) subgroups = gs.read_command( "i.group", group=group_name, flags="sg" ).splitlines() @@ -77,7 +77,7 @@ def main(): if options["map"]: map_name = gs.find_file(name=options["map"], element="cell")["fullname"] if not map_name: - gs.fatal(_("Raster map <%s> not found") % options["map"]) + gs.fatal(_("Raster map <%s> not found.") % options["map"]) if options["trainingmap"]: trainingmap_name = gs.find_file(name=options["trainingmap"], element="vector")[ diff --git a/gui/wxpython/lmgr/workspace.py b/gui/wxpython/lmgr/workspace.py index 8701840214a..b0c440dbc5b 100644 --- a/gui/wxpython/lmgr/workspace.py +++ b/gui/wxpython/lmgr/workspace.py @@ -449,7 +449,7 @@ def SaveToFile(self, filename): except OSError: GError( parent=self.lmgr, - message=_("Unable to open file <%s> for writing.") % filename, + message=_("Unable to open file '%s' for writing.") % filename, ) return False self.AddFileToHistory(file_path=filename) diff --git a/gui/wxpython/location_wizard/wizard.py b/gui/wxpython/location_wizard/wizard.py index 8e0321a450e..8fe342ab043 100644 --- a/gui/wxpython/location_wizard/wizard.py +++ b/gui/wxpython/location_wizard/wizard.py @@ -2745,7 +2745,7 @@ def OnWizFinished(self): not self.filepage.georeffile or not Path(self.filepage.georeffile).is_file() ): - return _("File <%s> not found.") % self.filepage.georeffile + return _("File '%s' not found.") % self.filepage.georeffile grass.create_location( dbase=self.startpage.grassdatabase, diff --git a/gui/wxpython/mapdisp/toolbars.py b/gui/wxpython/mapdisp/toolbars.py index e90252e46ce..185d578d85e 100644 --- a/gui/wxpython/mapdisp/toolbars.py +++ b/gui/wxpython/mapdisp/toolbars.py @@ -29,7 +29,7 @@ ), "select": MetaIcon( img="select", - label=_("Select vector feature(s)"), + label=_("Select vector features"), desc=_("Select features interactively from vector map"), ), "addBarscale": MetaIcon(img="scalebar-add", label=_("Add scale bar")), diff --git a/gui/wxpython/mapswipe/g.gui.mapswipe.py b/gui/wxpython/mapswipe/g.gui.mapswipe.py index 324dd3c7471..5e493ea1765 100755 --- a/gui/wxpython/mapswipe/g.gui.mapswipe.py +++ b/gui/wxpython/mapswipe/g.gui.mapswipe.py @@ -68,7 +68,7 @@ def main(): if mapName: gfile = gs.find_file(name=mapName) if not gfile["name"]: - gs.fatal(_("Raster map <%s> not found") % mapName) + gs.fatal(_("Raster map <%s> not found.") % mapName) app = wx.App() diff --git a/gui/wxpython/modules/histogram.py b/gui/wxpython/modules/histogram.py index df2ed237b78..8ce13012264 100644 --- a/gui/wxpython/modules/histogram.py +++ b/gui/wxpython/modules/histogram.py @@ -401,7 +401,7 @@ def GetOptData(self, dcmd, layer, params, propwin): dcmd, fullyQualified=True, layerType="raster" ) if not found: - GError(parent=propwin, message=_("Raster map <%s> not found") % name) + GError(parent=propwin, message=_("Raster map <%s> not found.") % name) return self.SetHistLayer(name, dcmd) diff --git a/gui/wxpython/nviz/mapwindow.py b/gui/wxpython/nviz/mapwindow.py index 6e575929dd4..602564e3939 100644 --- a/gui/wxpython/nviz/mapwindow.py +++ b/gui/wxpython/nviz/mapwindow.py @@ -1785,7 +1785,7 @@ def _unloadRaster(self, item): nvizType = "volume" unloadFn = self._display.UnloadVolume errorMsg = _("Unable to unload 3d raster map") - successMsg = _("3d raster map") + successMsg = _("3D raster map") try: id = data[nvizType]["object"]["id"] diff --git a/gui/wxpython/nviz/wxnviz.py b/gui/wxpython/nviz/wxnviz.py index b56d068ae81..bd33b0d94ca 100644 --- a/gui/wxpython/nviz/wxnviz.py +++ b/gui/wxpython/nviz/wxnviz.py @@ -592,7 +592,7 @@ def LoadSurface(self, name, color_name, color_value): """ mapset = G_find_raster2(name, "") if mapset is None: - G_warning(_("Raster map <%s> not found"), name) + G_warning(_("Raster map <%s> not found."), name) return -1 # topography @@ -603,7 +603,7 @@ def LoadSurface(self, name, color_name, color_value): if color_name: # check for color map mapset = G_find_raster2(color_name, "") if mapset is None: - G_warning(_("Raster map <%s> not found"), color_name) + G_warning(_("Raster map <%s> not found."), color_name) GS_delete_surface(id) return -1 @@ -782,7 +782,7 @@ def LoadVolume(self, name, color_name, color_value): """ mapset = G_find_raster3d(name, "") if mapset is None: - G_warning(_("3d raster map <%s> not found"), name) + G_warning(_("3D raster map <%s> not found."), name) return -1 # topography @@ -793,7 +793,7 @@ def LoadVolume(self, name, color_name, color_value): if color_name: # check for color map mapset = G_find_raster3d(color_name, "") if mapset is None: - G_warning(_("3d raster map <%s> not found"), color_name) + G_warning(_("3D raster map <%s> not found."), color_name) GVL_delete_vol(id) return -1 diff --git a/gui/wxpython/psmap/frame.py b/gui/wxpython/psmap/frame.py index d28ff95cd72..f446b9151d0 100644 --- a/gui/wxpython/psmap/frame.py +++ b/gui/wxpython/psmap/frame.py @@ -574,7 +574,7 @@ def getFile(self, wildcard): filename = "" dlg = wx.FileDialog( self, - message=_("Save file as"), + message=_("Save file as..."), defaultDir="", defaultFile=mapName, wildcard=wildcard, @@ -799,7 +799,7 @@ def OnAddVect(self, event): def OnAddScalebar(self, event): """Add scalebar""" if projInfo()["proj"] == "ll": - GMessage(message=_("Scalebar is not appropriate for this projection")) + GMessage(message=_("Scalebar is not appropriate for this projection.")) return if self.instruction.FindInstructionByType("scalebar"): id = self.instruction.FindInstructionByType("scalebar").id diff --git a/gui/wxpython/psmap/instructions.py b/gui/wxpython/psmap/instructions.py index 7c5afcf8637..0e7ac00d345 100644 --- a/gui/wxpython/psmap/instructions.py +++ b/gui/wxpython/psmap/instructions.py @@ -702,7 +702,7 @@ def Read(self, instruction, text, **kwargs): elif line.startswith("color"): instr["color"] = line.split()[1] except IndexError: - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False elif instruction == "scale": @@ -929,7 +929,7 @@ def Read(self, instruction, text): elif sub[0] == "where": instr["where"] = float(sub[1].split()[0]), float(sub[1].split()[1]) except (ValueError, IndexError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False self.instruction.update(instr) self.instruction["rect"] = self.EstimateRect(mapinfoDict=self.instruction) @@ -1057,7 +1057,7 @@ def Read(self, instruction, text, **kwargs): instr["background"] = "none" except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False instr["where"] = PaperMapCoordinates( mapInstr=map, @@ -1132,7 +1132,7 @@ def Read(self, instruction, text, **kwargs): instr["scale"] = float(line.split(None, 1)[1]) except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False if not Path(instr["epsfile"]).exists(): GError( @@ -1317,7 +1317,7 @@ def Read(self, instruction, text, **kwargs): instr["fcolor"] = line.split(None, 1)[1] except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False self.instruction.update(instr) @@ -1392,7 +1392,7 @@ def Read(self, instruction, text, **kwargs): instr["color"] = line.split(None, 1)[1] except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False self.instruction.update(instr) @@ -1470,7 +1470,7 @@ def Read(self, instruction, text, **kwargs): instr["fcolor"] = line.split(None, 1)[1] except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False self.instruction.update(instr) @@ -1576,7 +1576,7 @@ def Read(self, instruction, text, **kwargs): elif line.split()[1].strip().lower() in {"n", "no", "none"}: instr["background"] = "n" except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False self.instruction.update(instr) @@ -1717,7 +1717,7 @@ def Read(self, instruction, text, **kwargs): instr["discrete"] = "n" except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False if "raster" in instr: @@ -1859,7 +1859,7 @@ def Read(self, instruction, text, **kwargs): instr["border"] = line.split()[1] except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False self.instruction.update(instr) @@ -1909,7 +1909,7 @@ def Read(self, instruction, text): try: map = text.split()[1] except IndexError: - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False try: info = gs.find_file(map, element="cell") @@ -2261,7 +2261,7 @@ def Read(self, instruction, text, **kwargs): labels = line.split(None, 1)[1] self.instruction["labels"].append(labels) except (IndexError, ValueError): - GError(_("Failed to read instruction %s") % instruction) + GError(_("Failed to read instruction %s.") % instruction) return False return True diff --git a/gui/wxpython/rlisetup/wizard.py b/gui/wxpython/rlisetup/wizard.py index 59bc21362de..b6b3423e03d 100644 --- a/gui/wxpython/rlisetup/wizard.py +++ b/gui/wxpython/rlisetup/wizard.py @@ -593,7 +593,7 @@ def __init__(self, wizard, parent): choices=[ _("Whole map layer"), _("Keyboard setting"), - _("Draw the sampling frame"), + _("Draw sampling frame"), ], majorDimension=1, style=wx.RA_SPECIFY_ROWS, diff --git a/gui/wxpython/vdigit/g.gui.vdigit.py b/gui/wxpython/vdigit/g.gui.vdigit.py index db170684164..efaa582b472 100644 --- a/gui/wxpython/vdigit/g.gui.vdigit.py +++ b/gui/wxpython/vdigit/g.gui.vdigit.py @@ -119,11 +119,11 @@ def __init__(self, parent, vectorMap): % options["map"] ) else: - gs.verbose(_("New vector map <%s> created") % options["map"]) + gs.verbose(_("Vector map <%s> created.") % options["map"]) try: gs.run_command("v.edit", map=options["map"], tool="create", quiet=True) except CalledModuleError: - gs.fatal(_("Unable to create new vector map <%s>") % options["map"]) + gs.fatal(_("Unable to create vector map <%s>.") % options["map"]) # allow immediate rendering driver = UserSettings.Get(group="display", key="driver", subkey="type") diff --git a/gui/wxpython/vnet/dialogs.py b/gui/wxpython/vnet/dialogs.py index c0e92376cb2..e768e2b66bf 100644 --- a/gui/wxpython/vnet/dialogs.py +++ b/gui/wxpython/vnet/dialogs.py @@ -83,7 +83,7 @@ def __init__( parent, giface, id=wx.ID_ANY, - title=_("Vector Network Analysis Tool"), + title=_("Vector network analysis tool"), style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER, **kwargs, ): diff --git a/gui/wxpython/vnet/vnet_core.py b/gui/wxpython/vnet/vnet_core.py index b95fa83cd12..19c7b41a889 100644 --- a/gui/wxpython/vnet/vnet_core.py +++ b/gui/wxpython/vnet/vnet_core.py @@ -276,7 +276,7 @@ def CreateTttb(self, params): dlg = wx.MessageDialog( parent=self.guiparent, message=_( - "Vector map %s already exists. " + "Do you want to overwrite it?" + "Vector map <%s> already exists. Do you want to overwrite it?" ) % (existsMap["fullname"]), caption=_("Overwrite vector map"), @@ -352,7 +352,7 @@ def SaveTmpLayer(self, layer_name): dlg = wx.MessageDialog( parent=self.guiparent, message=_( - "Vector map %s already exists. " + "Do you want to overwrite it?" + "Vector map <%s> already exists. Do you want to overwrite it?" ) % (existsMap["fullname"]), caption=_("Overwrite vector map"), diff --git a/gui/wxpython/web_services/widgets.py b/gui/wxpython/web_services/widgets.py index d0bd2ea41b2..fe355b9457c 100644 --- a/gui/wxpython/web_services/widgets.py +++ b/gui/wxpython/web_services/widgets.py @@ -163,7 +163,7 @@ def _requestPage(self): # list of layers self.layersBox = StaticBox( - parent=self.req_page_panel, id=wx.ID_ANY, label=_("List of layers ") + parent=self.req_page_panel, id=wx.ID_ANY, label=_("List of layers") ) style = wx.TR_DEFAULT_STYLE | wx.TR_HAS_BUTTONS | wx.TR_FULL_ROW_HIGHLIGHT diff --git a/imagery/i.atcorr/6s.cpp b/imagery/i.atcorr/6s.cpp index cb3a5dfcb5e..71dc05f714f 100644 --- a/imagery/i.atcorr/6s.cpp +++ b/imagery/i.atcorr/6s.cpp @@ -51,7 +51,7 @@ int init_6S(char *icnd_name) ifstream inText; inText.open(icnd_name); if (!inText.is_open()) { - G_fatal_error(_("Unable to open file <%s>"), icnd_name); + G_fatal_error(_("Unable to open file '%s'."), icnd_name); } /* redirect cin to the input text file */ diff --git a/imagery/i.cluster/main.c b/imagery/i.cluster/main.c index 1ed0f127f5c..bdcc976248e 100644 --- a/imagery/i.cluster/main.c +++ b/imagery/i.cluster/main.c @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) /* check all the inputs */ if (!I_find_group(group)) { - G_fatal_error(_("Group <%s> not found in current mapset"), group); + G_fatal_error(_("Group <%s> not found in current mapset."), group); } if (!I_find_subgroup(group, subgroup)) { G_fatal_error(_("Subgroup <%s> in group <%s> not found"), subgroup, @@ -356,7 +356,7 @@ int main(int argc, char *argv[]) G_date(), HOST_NEWLINE); fclose(report); - G_done_msg(_("File <%s> created."), outsigfile); + G_done_msg(_("File '%s' created."), outsigfile); exit(EXIT_SUCCESS); } diff --git a/imagery/i.cluster/open_files.c b/imagery/i.cluster/open_files.c index 7ad60e2bdc1..f94a5665576 100644 --- a/imagery/i.cluster/open_files.c +++ b/imagery/i.cluster/open_files.c @@ -59,7 +59,7 @@ int open_files(void) n = I_read_signatures(fd, &in_sig); fclose(fd); if (n < 0) - G_fatal_error(_("Unable to read signature file <%s>"), insigfile); + G_fatal_error(_("Unable to read signature file '%s'."), insigfile); if (in_sig.nsigs > 255) G_fatal_error(_("<%s> has too many signatures (limit is 255)"), diff --git a/imagery/i.eb.soilheatflux/main.c b/imagery/i.eb.soilheatflux/main.c index 62edb63fed3..21974301190 100644 --- a/imagery/i.eb.soilheatflux/main.c +++ b/imagery/i.eb.soilheatflux/main.c @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) input3 = G_define_standard_option(G_OPT_R_INPUT); input3->key = "temperature"; - input3->description = _("Name of Surface temperature raster map [K]"); + input3->description = _("Name of surface temperature raster map [K]"); input4 = G_define_standard_option(G_OPT_R_INPUT); input4->key = "netradiation"; diff --git a/imagery/i.fft/main.c b/imagery/i.fft/main.c index 9e7a65ad0a5..2a76a735922 100644 --- a/imagery/i.fft/main.c +++ b/imagery/i.fft/main.c @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) #define C(i, j) ((i) * cols + (j)) /* Read in cell map values */ - G_message(_("Reading the raster map <%s>..."), Cellmap_orig); + G_message(_("Reading raster map <%s>..."), Cellmap_orig); for (i = 0; i < rows; i++) { Rast_get_d_row(inputfd, cell_real, i); for (j = 0; j < cols; j++) { diff --git a/imagery/i.gensig/parse.c b/imagery/i.gensig/parse.c index 26ed415da58..bbb3a3eccee 100644 --- a/imagery/i.gensig/parse.c +++ b/imagery/i.gensig/parse.c @@ -35,10 +35,10 @@ int parse(int argc, char *argv[], struct parms *parms) /* check all the inputs */ if (G_find_raster(parms->training_map, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), parms->training_map); + G_fatal_error(_("Raster map <%s> not found."), parms->training_map); if (!I_find_group(parms->group)) - G_fatal_error(_("Group <%s> not found in current mapset"), + G_fatal_error(_("Group <%s> not found in current mapset."), parms->group); if (!I_find_subgroup(parms->group, parms->subgroup)) diff --git a/imagery/i.gensigset/parse.c b/imagery/i.gensigset/parse.c index 60650ce55ab..ebd34a69485 100644 --- a/imagery/i.gensigset/parse.c +++ b/imagery/i.gensigset/parse.c @@ -42,10 +42,10 @@ int parse(int argc, char *argv[], struct parms *parms) /* check all the inputs */ if (G_find_raster(parms->training_map, "") == NULL) { - G_fatal_error(_("Raster map <%s> not found"), parms->training_map); + G_fatal_error(_("Raster map <%s> not found."), parms->training_map); } if (!I_find_group(parms->group)) { - G_fatal_error(_("Group <%s> not found in current mapset"), + G_fatal_error(_("Group <%s> not found in current mapset."), parms->group); } if (!I_find_subgroup(parms->group, parms->subgroup)) { diff --git a/imagery/i.group/main.c b/imagery/i.group/main.c index 2ee6ba98660..8dd88868fea 100644 --- a/imagery/i.group/main.c +++ b/imagery/i.group/main.c @@ -130,9 +130,9 @@ int main(int argc, char *argv[]) } if (simple_flag->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON) { G_json_value_free(root_value); G_fatal_error(_("Cannot use the -g flag with format=json; " @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) rasters = G_malloc(m * sizeof(char *)); in = fopen(rastf->answer, "r"); if (!in) - G_fatal_error(_("Unable to open input file <%s>"), rastf->answer); + G_fatal_error(_("Unable to open input file '%s'."), rastf->answer); for (;;) { char buf[GNAME_MAX]; @@ -227,7 +227,7 @@ int main(int argc, char *argv[]) strcpy(mapset, found_mapset); } if (!I_find_group2(group, mapset)) - G_fatal_error(_("Group <%s> not found"), group); + G_fatal_error(_("Group <%s> not found."), group); struct Ref ref; diff --git a/imagery/i.maxlik/open.c b/imagery/i.maxlik/open.c index df325feaaf8..f8c268b6435 100644 --- a/imagery/i.maxlik/open.c +++ b/imagery/i.maxlik/open.c @@ -13,7 +13,7 @@ int open_files(void) I_init_group_ref(&Ref); if (!I_find_group(group)) - G_fatal_error(_("Group <%s> not found in current mapset"), group); + G_fatal_error(_("Group <%s> not found in current mapset."), group); if (!I_find_subgroup(group, subgroup)) G_fatal_error(_("Subgroup <%s> in group <%s> not found"), subgroup, @@ -41,7 +41,7 @@ int open_files(void) n = I_read_signatures(fd, &S); fclose(fd); if (n < 0) - G_fatal_error(_("Unable to read signature file <%s>"), sigfile); + G_fatal_error(_("Unable to read signature file '%s'."), sigfile); if (S.nsigs > 255) G_fatal_error(_("<%s> has too many signatures (limit is 255)"), diff --git a/imagery/i.ortho.photo/i.ortho.elev/main.c b/imagery/i.ortho.photo/i.ortho.elev/main.c index f9eeff261d0..ed357a6d600 100644 --- a/imagery/i.ortho.photo/i.ortho.elev/main.c +++ b/imagery/i.ortho.photo/i.ortho.elev/main.c @@ -213,7 +213,7 @@ int main(int argc, char *argv[]) if (G_find_raster2(elev_opt->answer, mapset_elev) == NULL) { /* select current location */ select_current_env(); - G_fatal_error(_("Raster map <%s> not found"), elev_opt->answer); + G_fatal_error(_("Raster map <%s> not found."), elev_opt->answer); } /* select current location */ select_current_env(); diff --git a/imagery/i.ortho.photo/i.ortho.init/main.c b/imagery/i.ortho.photo/i.ortho.init/main.c index a91b06be11f..c09931a01a6 100644 --- a/imagery/i.ortho.photo/i.ortho.init/main.c +++ b/imagery/i.ortho.photo/i.ortho.init/main.c @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) strcpy(group.name, group_opt->answer); if (!I_find_group(group.name)) { - G_fatal_error(_("Group [%s] not found"), group.name); + G_fatal_error(_("Group <%s> not found."), group.name); } G_debug(1, "Found group %s", group.name); diff --git a/imagery/i.ortho.photo/i.ortho.rectify/cp.c b/imagery/i.ortho.photo/i.ortho.rectify/cp.c index 954302fbb48..d5256b22f56 100644 --- a/imagery/i.ortho.photo/i.ortho.rectify/cp.c +++ b/imagery/i.ortho.photo/i.ortho.rectify/cp.c @@ -25,7 +25,7 @@ int get_conz_points(struct Ortho_Image_Group *group) strcat(msg, _(" Run OPTION 7 of i.ortho.photo again!\n")); break; case 0: - strcat(msg, _("No active Control Points!")); + strcat(msg, _("No active control points.")); strcat(msg, _(" Can not generate the transformation equation.")); strcat(msg, _(" Run OPTION 7 of i.ortho.photo!\n")); break; diff --git a/imagery/i.ortho.photo/i.ortho.rectify/main.c b/imagery/i.ortho.photo/i.ortho.rectify/main.c index 54fe92235e9..63696448e83 100644 --- a/imagery/i.ortho.photo/i.ortho.rectify/main.c +++ b/imagery/i.ortho.photo/i.ortho.rectify/main.c @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) /* find group */ if (!I_find_group(group.name)) { - G_fatal_error(_("Group <%s> not found"), group.name); + G_fatal_error(_("Group <%s> not found."), group.name); } /* determine the number of files in this group */ diff --git a/imagery/i.ortho.photo/i.ortho.transform/main.c b/imagery/i.ortho.photo/i.ortho.transform/main.c index 28d5956d516..07c50f250d2 100644 --- a/imagery/i.ortho.photo/i.ortho.transform/main.c +++ b/imagery/i.ortho.photo/i.ortho.transform/main.c @@ -316,7 +316,7 @@ static void analyze(void) else if (group.ref_equation_stat < 0 || group.con_equation_stat < 0) G_fatal_error(_("Parameter error")); else if (group.ref_equation_stat == 0 || group.con_equation_stat == 0) - G_fatal_error(_("No active control points")); + G_fatal_error(_("No active control points.")); else if (summary) { printf("Number of active points: %d\n", count); do_stats("Forward", &fwd); @@ -407,7 +407,7 @@ static void do_pt_xforms(void) else { fp = fopen(coord_file, "r"); if (!fp) - G_fatal_error(_("Unable to open file <%s>"), coord_file); + G_fatal_error(_("Unable to open file '%s'."), coord_file); } for (;;) { diff --git a/imagery/i.pca/main.c b/imagery/i.pca/main.c index 1a177210d52..c42a5512c98 100644 --- a/imagery/i.pca/main.c +++ b/imagery/i.pca/main.c @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) strcpy(name, opt_in->answers[i]); mapset = G_find_raster(name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), opt_in->answers[i]); /* Add input to group. */ I_add_file_to_group_ref(name, mapset, &ref); @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) else { /* Maybe input is group. Try to read group file */ if (I_get_group_ref(opt_in->answer, &ref) != 1) - G_fatal_error(_("Group <%s> not found"), opt_in->answer); + G_fatal_error(_("Group <%s> not found."), opt_in->answer); } bands = ref.nfiles; diff --git a/imagery/i.rectify/cp.c b/imagery/i.rectify/cp.c index a22b97273b7..c5152db4bdd 100644 --- a/imagery/i.rectify/cp.c +++ b/imagery/i.rectify/cp.c @@ -32,7 +32,7 @@ int get_control_points(struct Image_Group *group, int order) _("Not enough memory to solve transformation equations.")); break; case -3: - strcat(msg, _("Invalid order.")); + strcat(msg, _("Invalid order")); break; default: return 1; diff --git a/imagery/i.rectify/main.c b/imagery/i.rectify/main.c index 62f67fa5d6f..0fed69cadd4 100644 --- a/imagery/i.rectify/main.c +++ b/imagery/i.rectify/main.c @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) /* find group */ if (!I_find_group(group.name)) { - G_fatal_error(_("Group <%s> not found"), group.name); + G_fatal_error(_("Group <%s> not found."), group.name); } /* determine the number of files in this group */ diff --git a/imagery/i.segment/cluster.c b/imagery/i.segment/cluster.c index e8eb90a399b..92a4ea08c1c 100644 --- a/imagery/i.segment/cluster.c +++ b/imagery/i.segment/cluster.c @@ -121,7 +121,7 @@ CELL cluster_bands(struct globals *globals) /* temp file for initial clump IDs */ cname = G_tempfile(); if ((cfd = open(cname, O_RDWR | O_CREAT | O_EXCL, 0600)) < 0) - G_fatal_error(_("Unable to open temp file")); + G_fatal_error(_("Unable to open temp file.")); csize = ncols * sizeof(CELL); /* initialize clump labels */ diff --git a/imagery/i.segment/flag.c b/imagery/i.segment/flag.c index 3cfed9ec2ff..8d01acff64e 100644 --- a/imagery/i.segment/flag.c +++ b/imagery/i.segment/flag.c @@ -18,13 +18,13 @@ FLAG *flag_create(int nrows, int ncols) (unsigned char **)G_malloc(nrows * sizeof(unsigned char *)); if (!new_flag->array) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); temp = (unsigned char *)G_malloc((size_t)nrows * new_flag->leng * sizeof(unsigned char)); if (!temp) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); for (i = 0; i < nrows; i++) { new_flag->array[i] = temp; diff --git a/imagery/i.segment/parse_args.c b/imagery/i.segment/parse_args.c index 41b8718c32c..6a8a1872366 100644 --- a/imagery/i.segment/parse_args.c +++ b/imagery/i.segment/parse_args.c @@ -199,7 +199,7 @@ int parse_args(int argc, char *argv[], struct globals *globals) } mapset = G_find_raster(name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), group->answers[bands]); /* Add input to group. */ I_add_file_to_group_ref(name, mapset, &globals->Ref); @@ -210,7 +210,7 @@ int parse_args(int argc, char *argv[], struct globals *globals) else { /* input is group. Try to read group file */ if (!I_get_group_ref(group->answers[0], &globals->Ref)) - G_fatal_error(_("Group <%s> not found in the current mapset"), + G_fatal_error(_("Group <%s> not found in current mapset."), group->answers[0]); if (globals->Ref.nfiles <= 0) @@ -286,12 +286,12 @@ int parse_args(int argc, char *argv[], struct globals *globals) /* consider shape */ globals->radio_weight = atof(radio_weight->answer); if (globals->radio_weight <= 0) - G_fatal_error(_("Option '%s' must be > 0"), radio_weight->key); + G_fatal_error(_("Option <%s> must be > 0."), radio_weight->key); if (globals->radio_weight > 1) G_fatal_error(_("Option '%s' must be <= 1"), radio_weight->key); globals->smooth_weight = atof(smooth_weight->answer); if (globals->smooth_weight < 0) - G_fatal_error(_("Option '%s' must be >= 0"), smooth_weight->key); + G_fatal_error(_("Option <%s> must be >= 0."), smooth_weight->key); if (globals->smooth_weight > 1) G_fatal_error(_("Option '%s' must be <= 1"), smooth_weight->key); #else diff --git a/imagery/i.smap/multialloc.c b/imagery/i.smap/multialloc.c index d69431a6161..7367bbcfc8d 100644 --- a/imagery/i.smap/multialloc.c +++ b/imagery/i.smap/multialloc.c @@ -109,7 +109,7 @@ unsigned char **get_img(int wd, int ht, size_t size) char *pt; if ((pt = multialloc(size, 2, ht, wd)) == NULL) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return ((unsigned char **)pt); } diff --git a/imagery/i.smap/openfiles.c b/imagery/i.smap/openfiles.c index 36a8bbe99d0..233f9523320 100644 --- a/imagery/i.smap/openfiles.c +++ b/imagery/i.smap/openfiles.c @@ -20,12 +20,12 @@ int openfiles(struct parms *parms, struct files *files, struct SigSet *S) parms->subgroup, parms->group); if (Ref.nfiles <= 0) - G_fatal_error(_("Subgroup <%s> in group <%s> contains no raster maps"), + G_fatal_error(_("Subgroup <%s> in group <%s> contains no raster maps."), parms->subgroup, parms->group); fd = I_fopen_sigset_file_old(parms->sigfile); if (fd == NULL) - G_fatal_error(_("Unable to read signature file <%s>"), parms->sigfile); + G_fatal_error(_("Unable to read signature file '%s'."), parms->sigfile); if (I_ReadSigSet(fd, S) < 0 || Ref.nfiles != S->nbands) G_fatal_error(_("Signature file <%s> is invalid"), parms->sigfile); diff --git a/imagery/i.smap/parse.c b/imagery/i.smap/parse.c index 7498761e697..97c8e40938a 100644 --- a/imagery/i.smap/parse.c +++ b/imagery/i.smap/parse.c @@ -58,7 +58,7 @@ int parse(int argc, char *argv[], struct parms *parms) /* check all the inputs */ if (!I_find_group(parms->group)) - G_fatal_error(_("Group <%s> not found in current mapset"), + G_fatal_error(_("Group <%s> not found in current mapset."), parms->group); if (!I_find_subgroup(parms->group, parms->subgroup)) diff --git a/imagery/i.smap/write_img.c b/imagery/i.smap/write_img.c index 5da9106b54c..34af3b44352 100644 --- a/imagery/i.smap/write_img.c +++ b/imagery/i.smap/write_img.c @@ -12,7 +12,7 @@ int write_img(unsigned char **img, float **goodness, int ncols, int nrows, int row, col; FCELL *fcellbuf = NULL; - G_important_message(_("Writing output raster map(s)...")); + G_important_message(_("Writing output raster maps...")); /* write goodness of fit */ if (parms->goodness_map) diff --git a/imagery/i.svm.train/main.c b/imagery/i.svm.train/main.c index 1ac33f55c85..03cbee6f9dc 100644 --- a/imagery/i.svm.train/main.c +++ b/imagery/i.svm.train/main.c @@ -255,7 +255,7 @@ int main(int argc, char *argv[]) char name_labels[GNAME_MAX + GMAPSET_MAX]; strcpy(name_labels, opt_labels->answer); if ((mapset_labels = G_find_raster(name_labels, "")) == NULL) { - G_fatal_error(_("Raster map <%s> not found"), opt_labels->answer); + G_fatal_error(_("Raster map <%s> not found."), opt_labels->answer); } if (G_unqualified_name(opt_sigfile->answer, G_mapset(), name_sigfile, diff --git a/imagery/i.target/main.c b/imagery/i.target/main.c index 87ef691ae88..acb00d0322b 100644 --- a/imagery/i.target/main.c +++ b/imagery/i.target/main.c @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) mapset->key = "mapset"; mapset->type = TYPE_STRING; mapset->required = NO; - mapset->description = _("Name of target mapset"); + mapset->description = _("Name of the target mapset"); c = G_define_flag(); c->key = 'c'; diff --git a/lib/cairodriver/read_xid.c b/lib/cairodriver/read_xid.c index c6d8683c9f1..f8364c0c098 100644 --- a/lib/cairodriver/read_xid.c +++ b/lib/cairodriver/read_xid.c @@ -11,7 +11,7 @@ void cairo_read_xid(void) fp = fopen(ca.file_name, "r"); if (!fp) - G_fatal_error(_("Unable to open input file <%s>"), ca.file_name); + G_fatal_error(_("Unable to open input file '%s'."), ca.file_name); if (!fgets(buf, sizeof(buf), fp)) G_fatal_error(_("Unable to read input file <%s>"), ca.file_name); diff --git a/lib/cairodriver/write_xid.c b/lib/cairodriver/write_xid.c index 463fd6d8268..07ef260a8ac 100644 --- a/lib/cairodriver/write_xid.c +++ b/lib/cairodriver/write_xid.c @@ -10,7 +10,7 @@ void cairo_write_xid(void) fp = fopen(ca.file_name, "w"); if (!fp) - G_fatal_error(_("Unable to open output file <%s>"), ca.file_name); + G_fatal_error(_("Unable to open output file '%s'."), ca.file_name); snprintf(buf, sizeof(buf), "0x%08lx\n", (unsigned long)ca.win); diff --git a/lib/db/dbmi_base/login.c b/lib/db/dbmi_base/login.c index cbdc4214c72..462dfddb527 100644 --- a/lib/db/dbmi_base/login.c +++ b/lib/db/dbmi_base/login.c @@ -110,7 +110,7 @@ static int read_file(LOGIN *login) fd = fopen(file, "r"); if (fd == NULL) { - G_warning(_("Unable to read file '%s'"), file); + G_warning(_("Unable to read file '%s'."), file); return -1; } diff --git a/lib/db/dbmi_client/copy_tab.c b/lib/db/dbmi_client/copy_tab.c index 39e5c8e0ae0..8e38065f7dc 100644 --- a/lib/db/dbmi_client/copy_tab.c +++ b/lib/db/dbmi_client/copy_tab.c @@ -240,7 +240,8 @@ static int copy_table(const char *from_drvname, const char *from_dbname, G_debug(3, "db__copy_table: %s", db_get_string(&sql)); if (db_open_select_cursor(from_driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: '%s'"), db_get_string(&sql)); + G_warning(_("Unable to open select cursor: '%s'."), + db_get_string(&sql)); db_close_database_shutdown_driver(to_driver); if (from_driver != to_driver) { db_close_database_shutdown_driver(from_driver); @@ -287,10 +288,10 @@ static int copy_table(const char *from_drvname, const char *from_dbname, db_close_cursor(&cursor); if (selcol && !selcol_found) - G_fatal_error(_("Column <%s> not found"), selcol); + G_fatal_error(_("Column <%s> not found."), selcol); if (db_create_table(to_driver, out_table) != DB_OK) { - G_warning(_("Unable to create table <%s>"), to_tblname); + G_warning(_("Unable to create table <%s>."), to_tblname); db_close_database_shutdown_driver(to_driver); if (from_driver != to_driver) { db_close_database_shutdown_driver(from_driver); @@ -314,7 +315,8 @@ static int copy_table(const char *from_drvname, const char *from_dbname, G_debug(3, "db__copy_table: %s", db_get_string(&sql)); if (db_open_select_cursor(from_driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: '%s'"), db_get_string(&sql)); + G_warning(_("Unable to open select cursor: '%s'."), + db_get_string(&sql)); db_close_database_shutdown_driver(to_driver); if (from_driver != to_driver) { db_close_database_shutdown_driver(from_driver); diff --git a/lib/db/dbmi_client/delete_tab.c b/lib/db/dbmi_client/delete_tab.c index fa9e54c000f..1729ac00ee7 100644 --- a/lib/db/dbmi_client/delete_tab.c +++ b/lib/db/dbmi_client/delete_tab.c @@ -48,7 +48,7 @@ int db_delete_table(const char *drvname, const char *dbname, G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_warning(_("Unable to drop table: '%s'"), db_get_string(&sql)); + G_warning(_("Unable to drop table: '%s'."), db_get_string(&sql)); db_close_database_shutdown_driver(driver); return DB_FAILED; } diff --git a/lib/db/dbmi_client/table.c b/lib/db/dbmi_client/table.c index 41ac0ff1eb9..7ff7fe0fe65 100644 --- a/lib/db/dbmi_client/table.c +++ b/lib/db/dbmi_client/table.c @@ -111,7 +111,7 @@ int db_get_table_number_of_rows(dbDriver *driver, dbString *sql) dbCursor cursor; if (db_open_select_cursor(driver, sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: '%s'"), db_get_string(sql)); + G_warning(_("Unable to open select cursor: '%s'."), db_get_string(sql)); db_close_database_shutdown_driver(driver); return -1; } diff --git a/lib/gis/legal_name.c b/lib/gis/legal_name.c index 3df02db9576..ec347039a4a 100644 --- a/lib/gis/legal_name.c +++ b/lib/gis/legal_name.c @@ -91,10 +91,10 @@ int G_check_input_output_name(const char *input, const char *output, int error) if (mapset == NULL) { if (error == G_FATAL_EXIT) { - G_fatal_error(_("Raster map <%s> not found"), input); + G_fatal_error(_("Raster map <%s> not found."), input); } else if (error == G_FATAL_PRINT) { - G_warning(_("Raster map <%s> not found"), input); + G_warning(_("Raster map <%s> not found."), input); return 1; } else { /* G_FATAL_RETURN */ diff --git a/lib/gis/ls.c b/lib/gis/ls.c index a5a0be89dff..bd6f5cd36ad 100644 --- a/lib/gis/ls.c +++ b/lib/gis/ls.c @@ -96,7 +96,7 @@ char **G_ls2(const char *dir, int *num_files) int n = 0; if ((dfd = opendir(dir)) == NULL) - G_fatal_error(_("Unable to open directory %s"), dir); + G_fatal_error(_("Unable to open directory '%s'."), dir); while ((dp = readdir(dfd)) != NULL) { if (dp->d_name[0] == '.') /* Don't list hidden files */ diff --git a/lib/gis/paths.c b/lib/gis/paths.c index c9727ec5db5..491dc5aa9b8 100644 --- a/lib/gis/paths.c +++ b/lib/gis/paths.c @@ -198,7 +198,7 @@ int G_owner(const char *path) ); if (hFile == INVALID_HANDLE_VALUE) { - G_fatal_error(_("Unable to open file <%s> for reading"), path); + G_fatal_error(_("Unable to open file '%s' for reading."), path); } /* Get the owner SID of the file. */ diff --git a/lib/gpde/n_arrays_io.c b/lib/gpde/n_arrays_io.c index b553cf465e7..a65a44098d2 100644 --- a/lib/gpde/n_arrays_io.c +++ b/lib/gpde/n_arrays_io.c @@ -264,7 +264,7 @@ N_array_3d *N_read_rast3d_to_array_3d(char *name, N_array_3d *array, int mask) depths = region.depths; if (NULL == G_find_raster3d(name, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), name); + Rast3d_fatal_error(_("3D raster map <%s> not found."), name); /*Open all maps with default region */ map = Rast3d_open_cell_old( diff --git a/lib/manage/do_remove.c b/lib/manage/do_remove.c index f80879944de..fde1edc8f1a 100644 --- a/lib/manage/do_remove.c +++ b/lib/manage/do_remove.c @@ -65,12 +65,12 @@ int M_do_remove(int n, const char *old) else { if (G_strcasecmp(list[n].alias, "raster") == 0) { if ((mapset = G_find_raster2(old, "")) == NULL) - G_warning(_("Raster map <%s> not found"), old); + G_warning(_("Raster map <%s> not found."), old); } if (G_strcasecmp(list[n].alias, "raster_3d") == 0) { if ((mapset = G_find_raster3d(old, "")) == NULL) - G_warning(_("3D raster map <%s> not found"), old); + G_warning(_("3D raster map <%s> not found."), old); } for (i = 0; i < list[n].nelem; i++) { diff --git a/lib/manage/do_rename.c b/lib/manage/do_rename.c index 97b4c0a2a6e..1fde671fefa 100644 --- a/lib/manage/do_rename.c +++ b/lib/manage/do_rename.c @@ -63,12 +63,12 @@ int M_do_rename(int n, const char *old, const char *new) else { if (G_strcasecmp(list[n].alias, "raster") == 0) { if ((mapset = G_find_raster2(old, "")) == NULL) - G_warning(_("Raster map <%s> not found"), old); + G_warning(_("Raster map <%s> not found."), old); } if (G_strcasecmp(list[n].alias, "raster_3d") == 0) { if ((mapset = G_find_raster3d(old, "")) == NULL) - G_warning(_("3D raster map <%s> not found"), old); + G_warning(_("3D raster map <%s> not found."), old); } for (i = 0; i < list[n].nelem; i++) { diff --git a/lib/ogsf/gk2.c b/lib/ogsf/gk2.c index c0dafc5eef5..dec5cd89c28 100644 --- a/lib/ogsf/gk2.c +++ b/lib/ogsf/gk2.c @@ -209,7 +209,7 @@ void GK_print_keys(const char *name) int cnt = 1; if (NULL == (fp = fopen(name, "w"))) { - G_fatal_error(_("Unable to open file <%s> for writing"), name); + G_fatal_error(_("Unable to open file '%s' for writing."), name); } /* write a default frame rate of 30 at top of file */ fprintf(fp, "30 \n"); diff --git a/lib/ogsf/gp3.c b/lib/ogsf/gp3.c index 4ce437127fb..8b9da2c89eb 100644 --- a/lib/ogsf/gp3.c +++ b/lib/ogsf/gp3.c @@ -62,7 +62,7 @@ geopoint *Gp_load_sites(const char *name, int *nsites, int *has_z) Vect_set_open_level(1); if (Vect_open_old(&map, name, "") == -1) { - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), G_fully_qualified_name(name, mapset)); } @@ -202,13 +202,13 @@ int Gp_load_sites_thematic(geosite *gp, struct Colors *colors) Vect_set_open_level(1); if (Vect_open_old(&Map, gp->filename, "") == -1) { - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), G_fully_qualified_name(gp->filename, mapset)); } Fi = Vect_get_field(&Map, gp->tstyle->layer); if (!Fi) { - G_warning(_("Database connection not defined for layer %d"), + G_warning(_("Database connection not defined for layer %d."), gp->tstyle->layer); } else { diff --git a/lib/ogsf/gs3.c b/lib/ogsf/gs3.c index ae74ab1317a..9bbb7925fa9 100644 --- a/lib/ogsf/gs3.c +++ b/lib/ogsf/gs3.c @@ -113,7 +113,7 @@ int Gs_loadmap_as_float(struct Cell_head *wind, const char *map_name, map_set = G_find_raster2(map_name, ""); if (!map_set) { - G_warning(_("Raster map <%s> not found"), map_name); + G_warning(_("Raster map <%s> not found."), map_name); return 0; } *has_null = 0; @@ -178,7 +178,7 @@ int Gs_loadmap_as_int(struct Cell_head *wind, const char *map_name, int *buff, map_set = G_find_raster2(map_name, ""); if (!map_set) { - G_warning(_("Raster map <%s> not found"), map_name); + G_warning(_("Raster map <%s> not found."), map_name); return 0; } *has_null = 0; @@ -254,7 +254,7 @@ int Gs_numtype(const char *filename, int *negflag) mapset = G_find_raster2(filename, ""); if (!mapset) { - G_warning(_("Raster map <%s> not found"), filename); + G_warning(_("Raster map <%s> not found."), filename); return -1; } @@ -326,7 +326,7 @@ int Gs_loadmap_as_short(struct Cell_head *wind, const char *map_name, map_set = G_find_raster2(map_name, ""); if (!map_set) { - G_warning(_("Raster map <%s> not found"), map_name); + G_warning(_("Raster map <%s> not found."), map_name); return -1; } *has_null = 0; @@ -433,7 +433,7 @@ int Gs_loadmap_as_char(struct Cell_head *wind, const char *map_name, map_set = G_find_raster2(map_name, ""); if (!map_set) { - G_warning(_("Raster map <%s> not found"), map_name); + G_warning(_("Raster map <%s> not found."), map_name); return -1; } *has_null = 0; @@ -521,7 +521,7 @@ int Gs_loadmap_as_bitmap(struct Cell_head *wind, const char *map_name, map_set = G_find_raster2(map_name, ""); if (!map_set) { - G_warning(_("Raster map <%s> not found"), map_name); + G_warning(_("Raster map <%s> not found."), map_name); return -1; } @@ -581,7 +581,7 @@ int Gs_build_256lookup(const char *filename, int *buff) mapset = G_find_raster2(filename, ""); if (!mapset) { - G_warning(_("Raster map <%s> not found"), filename); + G_warning(_("Raster map <%s> not found."), filename); return 0; } @@ -639,7 +639,7 @@ void Gs_pack_colors(const char *filename, int *buff, int rows, int cols) mapset = G_find_raster2(filename, ""); if (!mapset) { - G_warning(_("Raster map <%s> not found"), filename); + G_warning(_("Raster map <%s> not found."), filename); return; } @@ -709,7 +709,7 @@ void Gs_pack_colors_float(const char *filename, float *fbuf, int *ibuf, mapset = G_find_raster2(filename, ""); if (!mapset) { - G_warning(_("Raster map <%s> not found"), filename); + G_warning(_("Raster map <%s> not found."), filename); return; } @@ -779,7 +779,7 @@ int Gs_get_cat_label(const char *filename, int drow, int dcol, char *catstr) int fd = -1; if ((mapset = G_find_raster2(filename, "")) == NULL) { - G_warning(_("Raster map <%s> not found"), filename); + G_warning(_("Raster map <%s> not found."), filename); return 0; } diff --git a/lib/ogsf/gsd_img_ppm.c b/lib/ogsf/gsd_img_ppm.c index c46091a81ee..4378a86bad4 100644 --- a/lib/ogsf/gsd_img_ppm.c +++ b/lib/ogsf/gsd_img_ppm.c @@ -48,7 +48,7 @@ int GS_write_ppm(const char *name) } if (NULL == (fp = fopen(name, "w"))) { - G_warning(_("Unable to open file <%s> for writing"), name); + G_warning(_("Unable to open file '%s' for writing."), name); return (1); } @@ -93,7 +93,7 @@ int GS_write_zoom(const char *name, unsigned int xsize, unsigned int ysize) } if (NULL == (fp = fopen(name, "w"))) { - G_warning(_("Unable to open file <%s> for writing"), name); + G_warning(_("Unable to open file '%s' for writing."), name); return (1); } diff --git a/lib/ogsf/gsd_img_tif.c b/lib/ogsf/gsd_img_tif.c index eca3f98e3e3..dc4793c48ca 100644 --- a/lib/ogsf/gsd_img_tif.c +++ b/lib/ogsf/gsd_img_tif.c @@ -62,7 +62,7 @@ int GS_write_tif(const char *name) out = TIFFOpen(name, "w"); if (out == NULL) { - G_warning(_("Unable to open file <%s> for writing"), name); + G_warning(_("Unable to open file '%s' for writing."), name); return (1); } diff --git a/lib/ogsf/gsd_legend.c b/lib/ogsf/gsd_legend.c index 6d1faf04f03..e5605a29b77 100644 --- a/lib/ogsf/gsd_legend.c +++ b/lib/ogsf/gsd_legend.c @@ -231,7 +231,7 @@ GLuint gsd_put_legend(const char *name, GLuint fontbase, int size, int *flags, mapset = G_find_raster2(name, ""); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), name); + G_warning(_("Raster map <%s> not found."), name); return (-1); } diff --git a/lib/ogsf/gv3.c b/lib/ogsf/gv3.c index f2cf5b86e1f..c40dcc86028 100644 --- a/lib/ogsf/gv3.c +++ b/lib/ogsf/gv3.c @@ -61,7 +61,7 @@ geoline *Gv_load_vect(const char *grassname, int *nlines) Vect_set_open_level(2); if (Vect_open_old(&map, grassname, "") == -1) { - G_warning(_("Unable to open vector map <%s>"), + G_warning(_("Unable to open vector map <%s>."), G_fully_qualified_name(grassname, mapset)); return NULL; } @@ -339,13 +339,13 @@ int Gv_load_vect_thematic(geovect *gv, struct Colors *colors) Vect_set_open_level(1); if (Vect_open_old(&Map, gv->filename, "") == -1) { - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), G_fully_qualified_name(gv->filename, mapset)); } Fi = Vect_get_field(&Map, gv->tstyle->layer); if (!Fi) { - G_warning(_("Database connection not defined for layer %d"), + G_warning(_("Database connection not defined for layer %d."), gv->tstyle->layer); } else { diff --git a/lib/ogsf/gvl3.c b/lib/ogsf/gvl3.c index 6e352b531fc..f80e952fc1a 100644 --- a/lib/ogsf/gvl3.c +++ b/lib/ogsf/gvl3.c @@ -33,7 +33,7 @@ int Gvl_load_colors_data(void **color_data, const char *name) struct Colors *colors; if (NULL == (mapset = G_find_raster3d(name, ""))) { - G_warning(_("3D raster map <%s> not found"), name); + G_warning(_("3D raster map <%s> not found."), name); return (-1); } diff --git a/lib/ogsf/gvl_file.c b/lib/ogsf/gvl_file.c index a280d0cc982..eb73c379029 100644 --- a/lib/ogsf/gvl_file.c +++ b/lib/ogsf/gvl_file.c @@ -419,7 +419,7 @@ void *open_g3d_file(const char *filename, IFLAG *type, double *min, double *max) /* search for g3d file a return his mapset */ mapset = G_find_raster3d(filename, ""); if (!mapset) { - G_warning(_("3D raster map <%s> not found"), filename); + G_warning(_("3D raster map <%s> not found."), filename); return (NULL); } diff --git a/lib/pngdriver/read_png.c b/lib/pngdriver/read_png.c index 55185da974d..30b19c46d5f 100644 --- a/lib/pngdriver/read_png.c +++ b/lib/pngdriver/read_png.c @@ -66,7 +66,7 @@ void read_png(void) input = fopen(png.file_name, "rb"); if (!input) - G_fatal_error(_("Unable to open output file <%s>"), png.file_name); + G_fatal_error(_("Unable to open output file '%s'."), png.file_name); png_set_read_fn(png_ptr, input, read_data); diff --git a/lib/raster/open.c b/lib/raster/open.c index 93139f45d19..cfbd816d589 100644 --- a/lib/raster/open.c +++ b/lib/raster/open.c @@ -173,7 +173,7 @@ int Rast__open_old(const char *name, const char *mapset) mapset = xmapset; if (!G_find_raster2(name, mapset)) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), G_fully_qualified_name(name, mapset)); /* Check for reclassification */ @@ -855,7 +855,7 @@ int Rast_map_is_fp(const char *name, const char *mapset) xmapset = G_find_raster2(name, mapset); if (!xmapset) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), G_fully_qualified_name(name, mapset)); G_file_name(path, "fcell", name, xmapset); @@ -892,7 +892,7 @@ RASTER_MAP_TYPE Rast_map_type(const char *name, const char *mapset) G_fatal_error(_("Raster map <%s> not found in mapset <%s>"), name, mapset); else - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); } G_file_name(path, "fcell", name, xmapset); @@ -945,7 +945,7 @@ RASTER_MAP_TYPE Rast__check_fp_type(const char *name, const char *mapset) xmapset = G_find_raster2(name, mapset); if (!xmapset) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), G_fully_qualified_name(name, mapset)); G_file_name_misc(path, "cell_misc", FORMAT_FILE, name, xmapset); diff --git a/lib/rowio/setup.c b/lib/rowio/setup.c index 9c9bbf01fa2..aac27d7f677 100644 --- a/lib/rowio/setup.c +++ b/lib/rowio/setup.c @@ -54,13 +54,13 @@ int Rowio_setup(ROWIO *R, int fd, int nrows, int len, R->rcb = (struct ROWIO_RCB *)G_malloc(nrows * sizeof(struct ROWIO_RCB)); if (R->rcb == NULL) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } for (i = 0; i < nrows; i++) { R->rcb[i].buf = G_malloc(len); if (R->rcb[i].buf == NULL) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } R->rcb[i].row = -1; /* mark not used */ diff --git a/lib/rst/interp_float/input2d.c b/lib/rst/interp_float/input2d.c index c6ee52d1211..1593bdf0c57 100644 --- a/lib/rst/interp_float/input2d.c +++ b/lib/rst/interp_float/input2d.c @@ -47,7 +47,7 @@ struct BM *IL_create_bitmask(struct interp_params *params) if (params->maskmap != NULL) { mapsetm = G_find_raster2(params->maskmap, ""); if (!mapsetm) - G_fatal_error(_("Mask raster map <%s> not found"), + G_fatal_error(_("Mask raster map <%s> not found."), params->maskmap); cellmask = Rast_allocate_c_buf(); diff --git a/lib/rst/interp_float/interp2d.c b/lib/rst/interp_float/interp2d.c index 79b6fda2e22..83a2532d345 100644 --- a/lib/rst/interp_float/interp2d.c +++ b/lib/rst/interp_float/interp2d.c @@ -130,13 +130,13 @@ int IL_grid_calc_2d( if (!w) { if (!(w = (double *)G_malloc(sizeof(double) * (params->KMAX2 + 9)))) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } } if (!w2) { if (!(w2 = (double *)G_malloc(sizeof(double) * (params->KMAX2 + 9)))) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } } diff --git a/lib/rst/interp_float/output2d.c b/lib/rst/interp_float/output2d.c index 8218691cba5..85b158069fc 100644 --- a/lib/rst/interp_float/output2d.c +++ b/lib/rst/interp_float/output2d.c @@ -261,7 +261,7 @@ int IL_output_2d(struct interp_params *params, if (params->elev != NULL) { mapset = G_find_file("cell", params->elev, ""); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), params->elev); + G_warning(_("Raster map <%s> not found."), params->elev); return -1; } Rast_write_colors(params->elev, mapset, &colors); @@ -348,7 +348,7 @@ int IL_output_2d(struct interp_params *params, if (params->slope != NULL) { mapset = G_find_file("cell", params->slope, ""); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), params->slope); + G_warning(_("Raster map <%s> not found."), params->slope); return -1; } Rast_write_colors(params->slope, mapset, &colors); @@ -422,7 +422,7 @@ int IL_output_2d(struct interp_params *params, if (params->aspect != NULL) { mapset = G_find_file("cell", params->aspect, ""); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), params->aspect); + G_warning(_("Raster map <%s> not found."), params->aspect); return -1; } Rast_write_colors(params->aspect, mapset, &colors); @@ -473,7 +473,7 @@ int IL_output_2d(struct interp_params *params, if (params->pcurv != NULL) { mapset = G_find_file("cell", params->pcurv, ""); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), params->pcurv); + G_warning(_("Raster map <%s> not found."), params->pcurv); return -1; } Rast_write_colors(params->pcurv, mapset, &colors); @@ -487,7 +487,7 @@ int IL_output_2d(struct interp_params *params, if (params->tcurv != NULL) { mapset = G_find_file("cell", params->tcurv, ""); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), params->tcurv); + G_warning(_("Raster map <%s> not found."), params->tcurv); return -1; } Rast_write_colors(params->tcurv, mapset, &colors); @@ -501,7 +501,7 @@ int IL_output_2d(struct interp_params *params, if (params->mcurv != NULL) { mapset = G_find_file("cell", params->mcurv, ""); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), params->mcurv); + G_warning(_("Raster map <%s> not found."), params->mcurv); return -1; } Rast_write_colors(params->mcurv, mapset, &colors); @@ -517,7 +517,7 @@ int IL_output_2d(struct interp_params *params, if (params->elev != NULL) { mapset = G_find_file("cell", params->elev, ""); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), params->elev); + G_warning(_("Raster map <%s> not found."), params->elev); return -1; } type = "raster"; diff --git a/lib/rst/interp_float/resout2d.c b/lib/rst/interp_float/resout2d.c index 6d46f21ebec..b4b48364fc0 100644 --- a/lib/rst/interp_float/resout2d.c +++ b/lib/rst/interp_float/resout2d.c @@ -235,7 +235,7 @@ int IL_resample_output_2d( if (params->elev != NULL) { if (maps == NULL) { - G_warning(_("Raster map <%s> not found"), input); + G_warning(_("Raster map <%s> not found."), input); return -1; } Rast_init_colors(&colors2); @@ -279,7 +279,7 @@ int IL_resample_output_2d( maps = NULL; maps = G_find_file("cell", params->elev, ""); if (maps == NULL) { - G_warning(_("Raster map <%s> not found"), params->elev); + G_warning(_("Raster map <%s> not found."), params->elev); return -1; } @@ -323,7 +323,7 @@ int IL_resample_output_2d( maps = NULL; maps = G_find_file("cell", params->slope, ""); if (maps == NULL) { - G_warning(_("Raster map <%s> not found"), params->slope); + G_warning(_("Raster map <%s> not found."), params->slope); return -1; } Rast_write_colors(params->slope, maps, &colors); @@ -355,7 +355,7 @@ int IL_resample_output_2d( maps = NULL; maps = G_find_file("cell", params->aspect, ""); if (maps == NULL) { - G_warning(_("Raster map <%s> not found"), params->aspect); + G_warning(_("Raster map <%s> not found."), params->aspect); return -1; } Rast_write_colors(params->aspect, maps, &colors); @@ -404,7 +404,7 @@ int IL_resample_output_2d( if (params->pcurv != NULL) { maps = G_find_file("cell", params->pcurv, ""); if (maps == NULL) { - G_warning(_("Raster map <%s> not found"), params->pcurv); + G_warning(_("Raster map <%s> not found."), params->pcurv); return -1; } Rast_write_colors(params->pcurv, maps, &colors); @@ -421,7 +421,7 @@ int IL_resample_output_2d( maps = NULL; maps = G_find_file("cell", params->tcurv, ""); if (maps == NULL) { - G_warning(_("Raster map <%s> not found"), params->tcurv); + G_warning(_("Raster map <%s> not found."), params->tcurv); return -1; } Rast_write_colors(params->tcurv, maps, &colors); @@ -436,7 +436,7 @@ int IL_resample_output_2d( maps = NULL; maps = G_find_file("cell", params->mcurv, ""); if (maps == NULL) { - G_warning(_("Raster map <%s> not found"), params->mcurv); + G_warning(_("Raster map <%s> not found."), params->mcurv); return -1; } Rast_write_colors(params->mcurv, maps, &colors); @@ -451,7 +451,7 @@ int IL_resample_output_2d( if (params->elev != NULL) { if (!G_find_file2("cell", params->elev, "")) { - G_warning(_("Raster map <%s> not found"), params->elev); + G_warning(_("Raster map <%s> not found."), params->elev); return -1; } diff --git a/lib/rst/interp_float/segmen2d.c b/lib/rst/interp_float/segmen2d.c index af30b816a40..4dc50b7ac8b 100644 --- a/lib/rst/interp_float/segmen2d.c +++ b/lib/rst/interp_float/segmen2d.c @@ -186,19 +186,19 @@ int IL_interp_segments_2d( if (!matrix) { if (!(matrix = G_alloc_matrix(params->KMAX2 + 1, params->KMAX2 + 1))) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } } if (!indx) { if (!(indx = G_alloc_ivector(params->KMAX2 + 1))) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } } if (!b) { if (!(b = G_alloc_vector(params->KMAX2 + 3))) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } } @@ -206,7 +206,7 @@ int IL_interp_segments_2d( if (params->cv) { if (!(point = (struct triple *)G_malloc(sizeof(struct triple) * data->n_points))) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } } diff --git a/lib/rst/interp_float/segmen2d_parallel.c b/lib/rst/interp_float/segmen2d_parallel.c index 83ce6c282dd..f5a9462b52a 100644 --- a/lib/rst/interp_float/segmen2d_parallel.c +++ b/lib/rst/interp_float/segmen2d_parallel.c @@ -69,21 +69,21 @@ int IL_interp_segments_2d_parallel( for (i_cnt = 0; i_cnt < threads; i_cnt++) { if (!(matrix[i_cnt] = G_alloc_matrix(params->KMAX2 + 1, params->KMAX2 + 1))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } } for (i_cnt = 0; i_cnt < threads; i_cnt++) { if (!(indx[i_cnt] = G_alloc_ivector(params->KMAX2 + 1))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } } for (i_cnt = 0; i_cnt < threads; i_cnt++) { if (!(b[i_cnt] = G_alloc_vector(params->KMAX2 + 3))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } } @@ -91,7 +91,7 @@ int IL_interp_segments_2d_parallel( for (i_cnt = 0; i_cnt < threads; i_cnt++) { if (!(A[i_cnt] = G_alloc_vector( (params->KMAX2 + 2) * (params->KMAX2 + 2) + 1))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } } @@ -254,7 +254,7 @@ int IL_interp_segments_2d_parallel( if (!(point = (struct triple *)G_malloc( sizeof(struct triple) * data_local[tid]->n_points))) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); some_thread_failed = -1; continue; } diff --git a/lib/rst/interp_float/vinput2d.c b/lib/rst/interp_float/vinput2d.c index 11a4169d350..78220e93a09 100644 --- a/lib/rst/interp_float/vinput2d.c +++ b/lib/rst/interp_float/vinput2d.c @@ -90,7 +90,7 @@ int IL_vector_input_data_2d( G_verbose_message(_("Loading data from attribute table ...")); Fi = Vect_get_field(Map, field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), field); G_debug(3, " driver = %s database = %s table = %s", Fi->driver, Fi->database, Fi->table); @@ -105,7 +105,7 @@ int IL_vector_input_data_2d( zctype = db_column_Ctype(driver, Fi->table, zcol); G_debug(3, " zcol C type = %d", zctype); if (zctype == -1) - G_fatal_error(_("Column <%s> not found"), zcol); + G_fatal_error(_("Column <%s> not found."), zcol); if (zctype != DB_C_TYPE_INT && zctype != DB_C_TYPE_DOUBLE) G_fatal_error(_("Data type of column <%s> must be numeric"), zcol); @@ -118,7 +118,7 @@ int IL_vector_input_data_2d( sctype = db_column_Ctype(driver, Fi->table, scol); G_debug(3, " scol C type = %d", sctype); if (sctype == -1) - G_fatal_error(_("Column <%s> not found"), scol); + G_fatal_error(_("Column <%s> not found."), scol); if (sctype != DB_C_TYPE_INT && sctype != DB_C_TYPE_DOUBLE) G_fatal_error(_("Data type of column <%s> must be numeric"), scol); @@ -132,7 +132,7 @@ int IL_vector_input_data_2d( } /* Lines without nodes */ - G_message(_("Reading features from vector map ...")); + G_message(_("Reading features from vector map...")); sm = 0; while ((ltype = Vect_read_next_line(Map, Points, Cats)) != -2) { diff --git a/lib/segment/open.c b/lib/segment/open.c index 5626ec082ca..8a2f763da66 100644 --- a/lib/segment/open.c +++ b/lib/segment/open.c @@ -111,7 +111,7 @@ int Segment_open(SEGMENT *SEG, char *fname, off_t nrows, off_t ncols, int srows, return -5; } else { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -6; } } diff --git a/lib/vector/Vlib/array.c b/lib/vector/Vlib/array.c index 450be87e6d5..8a2997825cc 100644 --- a/lib/vector/Vlib/array.c +++ b/lib/vector/Vlib/array.c @@ -261,7 +261,7 @@ int Vect_set_varray_from_db(struct Map_info *Map, int field, const char *where, /* Select categories from DB to array */ Fi = Vect_get_field(Map, field); if (Fi == NULL) { - G_warning(_("Database connection not defined for layer %d"), field); + G_warning(_("Database connection not defined for layer %d."), field); return -1; } diff --git a/lib/vector/Vlib/ascii.c b/lib/vector/Vlib/ascii.c index 6e81fdbe1ce..c858d23f062 100644 --- a/lib/vector/Vlib/ascii.c +++ b/lib/vector/Vlib/ascii.c @@ -324,7 +324,7 @@ int Vect_read_ascii_head(FILE *dascii, struct Map_info *Map) else if (strncmp(buff, "MAP THRESH:", 11) == 0) Vect_set_thresh(Map, atof(ptr)); else { - G_warning(_("Unknown keyword <%s> in vector head"), buff); + G_warning(_("Unknown keyword <%s> in vector head."), buff); } } /* NOTREACHED */ @@ -416,7 +416,7 @@ int Vect_write_ascii(FILE *ascii, FILE *att, struct Map_info *Map, int ver, if (field > 0 && (where || column_names)) { Fi = Vect_get_field(Map, field); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), field); } @@ -487,7 +487,7 @@ int Vect_write_ascii(FILE *ascii, FILE *att, struct Map_info *Map, int ver, } } if (!found) { - G_warning(_("Column <%s> does not exist"), + G_warning(_("Column <%s> does not exist."), column_names[i]); G_important_message(_("Available columns:")); for (j = 0; j < ncols; j++) { diff --git a/lib/vector/Vlib/cats.c b/lib/vector/Vlib/cats.c index e6f1a2f6712..3d1efe36654 100644 --- a/lib/vector/Vlib/cats.c +++ b/lib/vector/Vlib/cats.c @@ -589,7 +589,7 @@ struct cat_list *Vect_cats_set_constraint(struct Map_info *Map, int layer, Fi = Vect_get_field(Map, layer); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), layer); } diff --git a/lib/vector/Vlib/close.c b/lib/vector/Vlib/close.c index c0e630992fe..c0a12ac77d1 100644 --- a/lib/vector/Vlib/close.c +++ b/lib/vector/Vlib/close.c @@ -76,7 +76,7 @@ int Vect_close(struct Map_info *Map) putenv("GRASS_VECTOR_EXTERNAL_IMMEDIATE=1"); if (-1 == Vect_open_new(&Out, Vect_get_name(Map), Vect_is_3d(Map))) { - G_warning(_("Unable to create vector map <%s>"), + G_warning(_("Unable to create vector map <%s>."), Vect_get_name(Map)); return 1; } @@ -267,7 +267,7 @@ int Vect_save_frmt(struct Map_info *Map) fprintf(fd, "layer: %s\n", Map->fInfo.ogr.layer_name); } - G_verbose_message(_("Link to vector map <%s> created"), Map->name); + G_verbose_message(_("Link to vector map <%s> created."), Map->name); /* close frmt file */ fclose(fd); diff --git a/lib/vector/Vlib/copy.c b/lib/vector/Vlib/copy.c index 3c805d9ca87..a541e1a8384 100644 --- a/lib/vector/Vlib/copy.c +++ b/lib/vector/Vlib/copy.c @@ -644,7 +644,7 @@ int Vect_copy_tables(struct Map_info *In, struct Map_info *Out, int field) for (i = 0; i < n; i++) { Fi = Vect_get_dblink(In, i); if (Fi == NULL) { - G_warning(_("Database connection not defined for layer %d"), + G_warning(_("Database connection not defined for layer %d."), In->dblnk->field[i].number); return -1; } @@ -759,7 +759,7 @@ int Vect_copy_table_by_cats(struct Map_info *In, struct Map_info *Out, Fi = Vect_get_field(In, field_in); if (Fi == NULL) { - G_warning(_("Database connection not defined for layer %d"), field_in); + G_warning(_("Database connection not defined for layer %d."), field_in); return -1; } diff --git a/lib/vector/Vlib/header.c b/lib/vector/Vlib/header.c index 4706d11da86..a63e9bd67f5 100644 --- a/lib/vector/Vlib/header.c +++ b/lib/vector/Vlib/header.c @@ -175,7 +175,7 @@ int Vect__read_head(struct Map_info *Map) else if (strncmp(buff, "MAP THRESH:", sizeof(char) * 11) == 0) Vect_set_thresh(Map, atof(ptr)); else - G_warning(_("Unknown keyword '%s' in vector head"), buff); + G_warning(_("Unknown keyword <%s> in vector head."), buff); } fclose(head_fp); diff --git a/lib/vector/Vlib/line.c b/lib/vector/Vlib/line.c index aa7327ce233..23b4afd852f 100644 --- a/lib/vector/Vlib/line.c +++ b/lib/vector/Vlib/line.c @@ -45,7 +45,7 @@ struct line_pnts *Vect_new_line_struct(void) struct line_pnts *p; if (NULL == (p = Vect__new_line_struct())) - G_fatal_error("Vect_new_line_struct(): %s", _("Out of memory")); + G_fatal_error("Vect_new_line_struct(): %s", _("Out of memory.")); return p; } @@ -148,7 +148,7 @@ int Vect_append_point(struct line_pnts *Points, double x, double y, double z) register int n; if (0 > dig_alloc_points(Points, Points->n_points + 1)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } diff --git a/lib/vector/Vlib/map.c b/lib/vector/Vlib/map.c index 34e86adeb4c..3014d84418d 100644 --- a/lib/vector/Vlib/map.c +++ b/lib/vector/Vlib/map.c @@ -43,7 +43,7 @@ struct Map_info *Vect_new_map_struct(void) p = (struct Map_info *)malloc(sizeof(struct Map_info)); if (NULL == p) - G_fatal_error("Vect_new_map_struct(): %s", _("Out of memory")); + G_fatal_error("Vect_new_map_struct(): %s", _("Out of memory.")); G_zero(p, sizeof(struct Map_info)); @@ -186,7 +186,7 @@ int Vect_copy(const char *in, const char *mapset, const char *out) /* Open input */ Vect_set_open_level(1); if (Vect_open_old_head(&In, in, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in); + G_fatal_error(_("Unable to open vector map <%s>."), in); if (In.format != GV_FORMAT_NATIVE) { /* Done */ Vect_close(&In); @@ -196,7 +196,7 @@ int Vect_copy(const char *in, const char *mapset, const char *out) /* Open output */ Vect_set_open_level(1); if (Vect_open_update_head(&Out, out, G_mapset()) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), out); + G_fatal_error(_("Unable to open vector map <%s>."), out); /* Copy tables */ if (Vect_copy_tables(&In, &Out, 0) != 0) { @@ -269,7 +269,7 @@ int Vect_rename(const char *in, const char *out) /* Rename all tables if the format is native */ Vect_set_open_level(1); if (Vect_open_update_head(&Map, out, G_mapset()) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), out); + G_fatal_error(_("Unable to open vector map <%s>."), out); if (Map.format != GV_FORMAT_NATIVE) { /* Done */ Vect_close(&Map); @@ -295,7 +295,7 @@ int Vect_rename(const char *in, const char *out) Fin = Vect_get_field(&Map, fields[i]); if (Fin == NULL) { - G_warning(_("Database connection not defined for layer %d"), + G_warning(_("Database connection not defined for layer %d."), fields[i]); Vect_close(&Map); return -1; @@ -428,7 +428,8 @@ int Vect__delete(const char *map, int is_tmp) 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); @@ -477,7 +478,7 @@ int Vect__delete(const char *map, int is_tmp) G_debug(3, "opendir '%s'", path); dir = opendir(path); if (dir == NULL) { - G_warning(_("Unable to open directory '%s'"), path); + G_warning(_("Unable to open directory '%s'."), path); return -1; } @@ -496,7 +497,7 @@ int Vect__delete(const char *map, int is_tmp) G_debug(3, "delete file '%s'", path_buf); ret = unlink(path_buf); if (ret == -1) { - G_warning(_("Unable to delete file '%s'"), path_buf); + G_warning(_("Unable to delete file '%s'."), path_buf); closedir(dir); return -1; } diff --git a/lib/vector/Vlib/net_build.c b/lib/vector/Vlib/net_build.c index 7a358144a49..60fc3527f53 100644 --- a/lib/vector/Vlib/net_build.c +++ b/lib/vector/Vlib/net_build.c @@ -147,7 +147,7 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, G_fatal_error(_("Turntable field < 1")); Fi = Vect_get_field(Map, tfield); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), tfield); /* Open database */ @@ -198,7 +198,7 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, Fi = Vect_get_field(Map, nfield); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), nfield); driver = db_start_driver_open_database(Fi->driver, Fi->database); @@ -491,7 +491,7 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, G_fatal_error(_("Arc field < 1")); Fi = Vect_get_field(Map, afield); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), afield); /* Open database */ @@ -788,7 +788,7 @@ int Vect_net_build_graph(struct Map_info *Map, int ltype, int afield, G_fatal_error(_("Arc field < 1")); Fi = Vect_get_field(Map, afield); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), afield); /* Open database */ @@ -965,7 +965,7 @@ int Vect_net_build_graph(struct Map_info *Map, int ltype, int afield, Fi = Vect_get_field(Map, nfield); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), nfield); driver = db_start_driver_open_database(Fi->driver, Fi->database); diff --git a/lib/vector/Vlib/open.c b/lib/vector/Vlib/open.c index d6d78fc25d8..800f4201157 100644 --- a/lib/vector/Vlib/open.c +++ b/lib/vector/Vlib/open.c @@ -295,7 +295,7 @@ int Vect__open_old(struct Map_info *Map, const char *name, const char *mapset, G_debug(1, "Vector format: %d (non-native)", format); if (format < 0) { - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), Vect_get_full_name(Map)); return -1; } @@ -436,7 +436,7 @@ int Vect__open_old(struct Map_info *Map, const char *name, const char *mapset, if (level >= 2) { /* support files opened */ dig_free_plus(&(Map->plus)); } - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), Vect_get_full_name(Map)); return -1; } diff --git a/lib/vector/Vlib/write_ogr.c b/lib/vector/Vlib/write_ogr.c index 8cf7c46fe6b..94dcb196e29 100644 --- a/lib/vector/Vlib/write_ogr.c +++ b/lib/vector/Vlib/write_ogr.c @@ -187,7 +187,8 @@ dbDriver *create_table(OGRLayerH hLayer, const struct field_info *Fi) db_append_string(&sql, " where 0 = 1"); if (db_open_select_cursor(driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: '%s'"), db_get_string(&sql)); + G_warning(_("Unable to open select cursor: '%s'."), + db_get_string(&sql)); db_close_database_shutdown_driver(driver); return NULL; } diff --git a/lib/vector/diglib/struct_alloc.c b/lib/vector/diglib/struct_alloc.c index 4998daa207b..5c424cd6b0a 100644 --- a/lib/vector/diglib/struct_alloc.c +++ b/lib/vector/diglib/struct_alloc.c @@ -486,6 +486,6 @@ int dig_isle_alloc_line(struct P_isle *isle, int add) */ int dig_out_of_memory(void) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } diff --git a/lib/vector/neta/articulation_point.c b/lib/vector/neta/articulation_point.c index eab80d43913..6f22f0cfc5d 100644 --- a/lib/vector/neta/articulation_point.c +++ b/lib/vector/neta/articulation_point.c @@ -56,7 +56,7 @@ int NetA_articulation_points(dglGraph_s *graph, struct ilist *articulation_list) current_edge = (dglInt32_t **)G_calloc(nnodes + 1, sizeof(dglInt32_t *)); mark = (int *)G_calloc(nnodes + 1, sizeof(int)); if (!tin || !min_tin || !parent || !stack || !current || !mark) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } diff --git a/lib/vector/neta/bridge.c b/lib/vector/neta/bridge.c index 33fa5a54beb..1bca1464f25 100644 --- a/lib/vector/neta/bridge.c +++ b/lib/vector/neta/bridge.c @@ -55,7 +55,7 @@ int NetA_compute_bridges(dglGraph_s *graph, struct ilist *bridge_list) stack = (dglInt32_t **)G_calloc(nnodes + 1, sizeof(dglInt32_t *)); current_edge = (dglInt32_t **)G_calloc(nnodes + 1, sizeof(dglInt32_t *)); if (!tin || !min_tin || !parent || !stack || !current) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } diff --git a/lib/vector/neta/centrality.c b/lib/vector/neta/centrality.c index d84d8e025d7..e1df65e3636 100644 --- a/lib/vector/neta/centrality.c +++ b/lib/vector/neta/centrality.c @@ -59,7 +59,7 @@ int NetA_eigenvector_centrality(dglGraph_s *graph, int iterations, double error, nnodes = dglGet_NodeCount(graph); tmp = (double *)G_calloc(nnodes + 1, sizeof(double)); if (!tmp) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } @@ -140,7 +140,7 @@ int NetA_betweenness_closeness(dglGraph_s *graph, double *betweenness, delta = (dglInt32_t *)G_calloc(nnodes + 1, sizeof(dglInt32_t)); if (!dst || !prev || !stack || !cnt || !delta) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } diff --git a/lib/vector/neta/components.c b/lib/vector/neta/components.c index b96e65a1fa1..784680bf2c7 100644 --- a/lib/vector/neta/components.c +++ b/lib/vector/neta/components.c @@ -68,7 +68,7 @@ int NetA_weakly_connected_components(dglGraph_s *graph, int *component) nnodes = dglGet_NodeCount(graph); stack = (dglInt32_t *)G_calloc(nnodes + 1, sizeof(dglInt32_t)); if (!stack) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } @@ -178,7 +178,7 @@ int NetA_strongly_connected_components(dglGraph_s *graph, int *component) order = (dglInt32_t *)G_calloc(nnodes + 1, sizeof(dglInt32_t)); processed = (int *)G_calloc(nnodes + 1, sizeof(int)); if (!stack || !order || !processed) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } diff --git a/lib/vector/neta/flow.c b/lib/vector/neta/flow.c index 9b091e3fad7..9fabe382e9b 100644 --- a/lib/vector/neta/flow.c +++ b/lib/vector/neta/flow.c @@ -63,7 +63,7 @@ int NetA_flow(dglGraph_s *graph, struct ilist *source_list, is_source = (char *)G_calloc(nnodes + 3, sizeof(char)); is_sink = (char *)G_calloc(nnodes + 3, sizeof(char)); if (!queue || !prev || !is_source || !is_sink) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } @@ -186,7 +186,7 @@ int NetA_min_cut(dglGraph_s *graph, struct ilist *source_list, queue = (dglInt32_t *)G_calloc(nnodes + 3, sizeof(dglInt32_t)); visited = (char *)G_calloc(nnodes + 3, sizeof(char)); if (!queue || !visited) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } diff --git a/lib/vector/neta/path.c b/lib/vector/neta/path.c index 93068b8a40b..98713f65048 100644 --- a/lib/vector/neta/path.c +++ b/lib/vector/neta/path.c @@ -255,7 +255,7 @@ int NetA_find_path(dglGraph_s *graph, int from, int to, int *edges, queue = (dglInt32_t *)G_calloc(nnodes + 1, sizeof(dglInt32_t)); vis = (char *)G_calloc(nnodes + 1, sizeof(char)); if (!prev || !queue || !vis) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } Vect_reset_list(list); diff --git a/lib/vector/neta/spanningtree.c b/lib/vector/neta/spanningtree.c index fb0ac934def..d7cf5351de0 100644 --- a/lib/vector/neta/spanningtree.c +++ b/lib/vector/neta/spanningtree.c @@ -99,7 +99,7 @@ int NetA_spanning_tree(dglGraph_s *graph, struct ilist *tree_list) nedges = dglGet_EdgeCount(graph); perm = (edge_cost_pair *)G_calloc(nedges, sizeof(edge_cost_pair)); if (!perm || !uf_initialize(&uf, nnodes + 1)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return -1; } /* dglGetEdge is only supported with graphs version > 1. Therefore this diff --git a/lib/vector/neta/timetables.c b/lib/vector/neta/timetables.c index c58b3d81d4b..246a1c3fec8 100644 --- a/lib/vector/neta/timetables.c +++ b/lib/vector/neta/timetables.c @@ -42,7 +42,7 @@ int NetA_init_distinct(dbDriver *driver, dbString *sql, int **lengths, dbValue *value; if (db_open_select_cursor(driver, sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: %s"), db_get_string(sql)); + G_warning(_("Unable to open select cursor: '%s'."), db_get_string(sql)); return -1; } /*TODO: check column types */ @@ -65,11 +65,11 @@ int NetA_init_distinct(dbDriver *driver, dbString *sql, int **lengths, *lengths = (int *)G_calloc(count, sizeof(int)); *ids = (int *)G_calloc(count, sizeof(int)); if (!*lengths || !*ids) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } if (db_open_select_cursor(driver, sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: %s"), db_get_string(sql)); + G_warning(_("Unable to open select cursor: '%s'."), db_get_string(sql)); return -1; } count = index = 0; @@ -132,7 +132,7 @@ int NetA_init_timetable_from_db(struct Map_info *In, int route_layer, Fi = Vect_get_field(In, route_layer); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), route_layer); driver = db_start_driver_open_database(Fi->driver, Fi->database); @@ -167,7 +167,7 @@ int NetA_init_timetable_from_db(struct Map_info *In, int route_layer, if (!timetable->route_stops || !timetable->route_times || !timetable->stop_routes || !timetable->stop_times || !timetable->walk_length) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return 2; } @@ -177,7 +177,7 @@ int NetA_init_timetable_from_db(struct Map_info *In, int route_layer, timetable->route_times[i] = (int *)G_calloc(timetable->route_length[i], sizeof(int)); if (!timetable->route_stops[i] || !timetable->route_times[i]) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return 2; } @@ -190,7 +190,7 @@ int NetA_init_timetable_from_db(struct Map_info *In, int route_layer, timetable->stop_times[i] = (int *)G_calloc(timetable->stop_length[i], sizeof(int)); if (!timetable->stop_routes[i] || !timetable->stop_times[i]) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return 2; } timetable->walk_length[i] = 0; @@ -202,7 +202,8 @@ int NetA_init_timetable_from_db(struct Map_info *In, int route_layer, db_set_string(&sql, buf); if (db_open_select_cursor(driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: %s"), db_get_string(&sql)); + G_warning(_("Unable to open select cursor: '%s'."), + db_get_string(&sql)); return 1; } @@ -241,7 +242,7 @@ int NetA_init_timetable_from_db(struct Map_info *In, int route_layer, if (db_open_select_cursor(driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: %s"), + G_warning(_("Unable to open select cursor: '%s'."), db_get_string(&sql)); return 1; } @@ -273,7 +274,7 @@ int NetA_init_timetable_from_db(struct Map_info *In, int route_layer, timetable->walk_times[i] = (int *)G_calloc(timetable->walk_length[i], sizeof(int)); if (!timetable->walk_stops[i] || !timetable->walk_times[i]) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return 2; } timetable->walk_length[i] = 0; @@ -281,7 +282,7 @@ int NetA_init_timetable_from_db(struct Map_info *In, int route_layer, if (db_open_select_cursor(driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_warning(_("Unable to open select cursor: %s"), + G_warning(_("Unable to open select cursor: '%s'."), db_get_string(&sql)); return 1; } @@ -407,7 +408,7 @@ int NetA_timetable_shortest_path(neta_timetable *timetable, int from_stop, if (!result->dst || !result->prev_stop || !result->prev_route || !result->prev_conn) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } @@ -418,7 +419,7 @@ int NetA_timetable_shortest_path(neta_timetable *timetable, int from_stop, result->prev_conn[i] = (int *)G_calloc(timetable->stops, sizeof(int)); if (!result->dst[i] || !result->prev_stop[i] || !result->prev_route[i] || !result->prev_conn[i]) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -1; } } diff --git a/lib/vector/neta/utils.c b/lib/vector/neta/utils.c index 0683f99255b..cd578539249 100644 --- a/lib/vector/neta/utils.c +++ b/lib/vector/neta/utils.c @@ -115,7 +115,8 @@ int NetA_get_node_costs(struct Map_info *In, int layer, char *column, Fi = Vect_get_field(In, layer); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), layer); + G_fatal_error(_("Database connection not defined for layer %d."), + layer); driver = db_start_driver_open_database(Fi->driver, Fi->database); if (driver == NULL) diff --git a/misc/m.measure/main.c b/misc/m.measure/main.c index 32851e61b84..c4acab5362a 100644 --- a/misc/m.measure/main.c +++ b/misc/m.measure/main.c @@ -68,7 +68,7 @@ int main(int argc, char **argv) shell = G_define_flag(); shell->key = 'g'; - shell->label = _("Shell script style [deprecated]"); + shell->label = _("Print in shell script style [deprecated]"); shell->description = _( "This flag is deprecated and will be removed in a future release. Use " "format=shell instead."); @@ -93,9 +93,9 @@ int main(int argc, char **argv) } if (shell->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON) { G_fatal_error(_("The -g flag cannot be used with format=json. " "Please select only one output format.")); diff --git a/misc/m.nviz.image/main.c b/misc/m.nviz.image/main.c index 27a77344efb..54af0da4f2b 100644 --- a/misc/m.nviz.image/main.c +++ b/misc/m.nviz.image/main.c @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) if (access(output_name, F_OK) == 0) { if (G_check_overwrite(argc, argv)) - G_warning(_("File <%s> already exists and will be overwritten"), + G_warning(_("File '%s' already exists and will be overwritten."), output_name); else G_fatal_error(_("option <%s>: <%s> exists. To overwrite, use the " @@ -242,7 +242,7 @@ int main(int argc, char *argv[]) else if (ret == 2) G_fatal_error(_("Unsupported output format")); - G_done_msg(_("File <%s> created."), output_name); + G_done_msg(_("File '%s' created."), output_name); Nviz_destroy_data(&data); Nviz_destroy_render_window(offscreen); diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c index fa4fed7f4b6..7a0dab7f33c 100644 --- a/misc/m.nviz.image/surface.c +++ b/misc/m.nviz.image/surface.c @@ -45,7 +45,7 @@ int load_rasters(const struct GParams *params, nv_data *data) if (i < nelev_map && strcmp(params->elev_map->answers[i], "")) { mapset = G_find_raster2(params->elev_map->answers[i], ""); if (mapset == NULL) { - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), params->elev_map->answers[i]); } mname = @@ -101,7 +101,7 @@ int load_rasters(const struct GParams *params, nv_data *data) if (i < ncolor_map && strcmp(params->color_map->answers[i], "")) { mapset = G_find_raster2(params->color_map->answers[i], ""); if (mapset == NULL) { - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), params->color_map->answers[i]); } mname = diff --git a/misc/m.nviz.image/vector.c b/misc/m.nviz.image/vector.c index 747232ce486..f5b339d0958 100644 --- a/misc/m.nviz.image/vector.c +++ b/misc/m.nviz.image/vector.c @@ -295,7 +295,7 @@ int check_map(const struct GParams *params, int index, int vlines, int *field, return 1; if (1 > Vect_open_old(&Map, map, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map); + G_fatal_error(_("Unable to open vector map <%s>."), map); Vect_set_error_handler_io(&Map, NULL); if (with_z) diff --git a/misc/m.nviz.image/volume.c b/misc/m.nviz.image/volume.c index 8e970686cb3..4794b141944 100644 --- a/misc/m.nviz.image/volume.c +++ b/misc/m.nviz.image/volume.c @@ -36,7 +36,7 @@ int load_rasters3d(const struct GParams *params, nv_data *data) for (i = 0; i < nvol; i++) { mapset = G_find_raster3d(params->volume->answers[i], ""); if (mapset == NULL) { - G_fatal_error(_("3d raster map <%s> not found"), + G_fatal_error(_("3D raster map <%s> not found."), params->volume->answers[i]); } char *mname = @@ -126,7 +126,7 @@ int add_isosurfs(const struct GParams *params, nv_data *data G_UNUSED) mapset = G_find_raster3d(params->isosurf_color_map->answers[i], ""); if (mapset == NULL) { - G_fatal_error(_("3d raster map <%s> not found"), + G_fatal_error(_("3D raster map <%s> not found."), params->isosurf_color_map->answers[i]); } diff --git a/misc/m.nviz.script/main.c b/misc/m.nviz.script/main.c index 0a1e0e0ff1b..be8d368b755 100644 --- a/misc/m.nviz.script/main.c +++ b/misc/m.nviz.script/main.c @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) strcat(outfile, ".nvscr"); if (NULL == (fp = fopen(outfile, "w"))) - G_fatal_error(_("Unable to open file <%s>"), outfile); + G_fatal_error(_("Unable to open file '%s'."), outfile); /* Get Raster Type */ data_type = Rast_get_map_type(fd); diff --git a/misc/m.transform/main.c b/misc/m.transform/main.c index 7642b8d4613..a7aff893ba0 100644 --- a/misc/m.transform/main.c +++ b/misc/m.transform/main.c @@ -185,13 +185,13 @@ static void do_stats(const char *name, const struct Stats *st) static void analyze(void) { if (equation_stat == -1) - G_warning(_("Poorly placed control points")); + G_warning(_("Poorly placed control points.")); else if (equation_stat == -2) G_fatal_error(_("Insufficient memory")); else if (equation_stat < 0) G_fatal_error(_("Parameter error")); else if (equation_stat == 0) - G_fatal_error(_("No active control points")); + G_fatal_error(_("No active control points.")); else if (summary) { printf("Number of active points: %d\n", count); do_stats("Forward", &fwd); @@ -267,7 +267,7 @@ static void do_pt_xforms(void) else { fp = fopen(coord_file, "r"); if (!fp) - G_fatal_error(_("Unable to open file <%s>"), coord_file); + G_fatal_error(_("Unable to open file '%s'."), coord_file); } for (;;) { diff --git a/ps/ps.map/do_geogrid.c b/ps/ps.map/do_geogrid.c index c22ef86379c..0e8a4a9d865 100644 --- a/ps/ps.map/do_geogrid.c +++ b/ps/ps.map/do_geogrid.c @@ -86,13 +86,13 @@ int do_geogrid(void) e2 = e1 + ((east - west) / SEGS); if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_INV, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e1, n1, &lon, &lat, 1); e1 = lon; n1 = lat; if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_INV, &e2, &n2, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e2, n2, &lon, &lat, 1); e2 = lon; n2 = lat; @@ -115,13 +115,13 @@ int do_geogrid(void) n2 = n1 + ((north - south) / SEGS); if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_INV, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e1, n1, &lon, &lat, 2); e1 = lon; n1 = lat; if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_INV, &e2, &n2, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e2, n2, &lon, &lat, 2); e2 = lon; n2 = lat; @@ -192,7 +192,7 @@ int do_geogrid_numbers(void) n1 = g; if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_INV, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e1, n1, &lon, &lat, 1); e1 = lon; n1 = lat; @@ -234,7 +234,7 @@ int do_geogrid_numbers(void) n1 = south; /* draw at south edge */ if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_INV, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); check_coords(e1, n1, &lon, &lat, 2); e1 = lon; n1 = lat; @@ -314,7 +314,7 @@ void get_ll_bounds(double *w, double *e, double *s, double *n) n1 = PS.w.north; if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_FWD, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); if (!first) { north = n1; first = 1; @@ -331,7 +331,7 @@ void get_ll_bounds(double *w, double *e, double *s, double *n) s1 = PS.w.south; if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_FWD, &e1, &s1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); if (!first) { south = s1; first = 1; @@ -349,7 +349,7 @@ void get_ll_bounds(double *w, double *e, double *s, double *n) n1 = ns; if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_FWD, &e1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); if (!first) { east = e1; first = 1; @@ -367,7 +367,7 @@ void get_ll_bounds(double *w, double *e, double *s, double *n) n1 = ns; if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_FWD, &w1, &n1, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); if (!first) { west = w1; first = 1; @@ -422,19 +422,19 @@ void check_coords(double e, double n, double *lon, double *lat, int par) /* convert original coords to ll */ if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_FWD, &e, &n, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); if (par == 1) { /* lines of latitude -- const. northing */ /* convert correct UTM to ll */ if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_FWD, &x, &y, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); /* convert new ll back to coords */ if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_INV, &x, &n, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); *lat = n; *lon = x; } @@ -443,12 +443,12 @@ void check_coords(double e, double n, double *lon, double *lat, int par) /* convert correct UTM to ll */ if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_FWD, &x, &y, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); /* convert new ll back to coords */ if (GPJ_transform(&info_in, &info_out, &info_trans, PJ_INV, &e, &y, NULL) < 0) - G_fatal_error(_("Error in GPJ_transform")); + G_fatal_error(_("Error in GPJ_transform().")); *lat = y; *lon = e; } diff --git a/ps/ps.map/main.c b/ps/ps.map/main.c index e35f393c728..3de0744815a 100644 --- a/ps/ps.map/main.c +++ b/ps/ps.map/main.c @@ -194,7 +194,7 @@ int main(int argc, char *argv[]) if (strcmp(input_file->answer, "-")) { inputfd = fopen(input_file->answer, "r"); if (!inputfd) - G_fatal_error(_("Unable to open file '%s': %s"), + G_fatal_error(_("Unable to open file '%s': %s."), input_file->answer, strerror(errno)); } else { diff --git a/ps/ps.map/ps_vpoints.c b/ps/ps.map/ps_vpoints.c index aff7ea6d0d8..beb34d444ab 100644 --- a/ps/ps.map/ps_vpoints.c +++ b/ps/ps.map/ps_vpoints.c @@ -167,7 +167,7 @@ int PS_vpoints_plot(struct Map_info *P_map, int vec) if (size_val < 0.0) { G_warning( - _("Attribute is of invalid size [%.3f] for category [%d]"), + _("Attribute is of invalid size (%.3f) for category %d."), size_val, cat); continue; } diff --git a/ps/ps.map/r_instructions.c b/ps/ps.map/r_instructions.c index 87a2e4bbfcf..fe3fa42c513 100644 --- a/ps/ps.map/r_instructions.c +++ b/ps/ps.map/r_instructions.c @@ -193,7 +193,7 @@ void read_instructions(int copies_set, int can_reset_scale) if (KEY("scalebar")) { if (G_projection() == PROJECTION_LL) { error(key, data, - _("scalebar is not appropriate for this projection")); + _("Scalebar is not appropriate for this projection.")); gobble_input(); } PS.do_scalebar = 1; diff --git a/raster/r.basins.fill/read_map.c b/raster/r.basins.fill/read_map.c index 67fdf9460f1..a1f4d8b8ae2 100644 --- a/raster/r.basins.fill/read_map.c +++ b/raster/r.basins.fill/read_map.c @@ -31,7 +31,7 @@ CELL *read_map(const char *name, int nomask, int nrows, int ncols) fd = Rast_open_old(name, ""); /* read the map */ - G_message(_("Reading <%s> ... "), name); + G_message(_("Reading <%s>..."), name); if (nomask) get_row = Rast_get_c_row_nomask; diff --git a/raster/r.buffer/main.c b/raster/r.buffer/main.c index edfa38b73ca..31b47d76954 100644 --- a/raster/r.buffer/main.c +++ b/raster/r.buffer/main.c @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) mapset = G_find_raster2(input, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), input); + G_fatal_error(_("Raster map <%s> not found."), input); /* parse units */ if (opt4->answer == NULL) diff --git a/raster/r.buildvrt/link.c b/raster/r.buildvrt/link.c index 3b29e9a6220..9a5cb3ada24 100644 --- a/raster/r.buildvrt/link.c +++ b/raster/r.buildvrt/link.c @@ -121,7 +121,7 @@ void create_map(const struct input *inputs, int num_inputs, const char *output, Rast_write_rstats(output, ostats); #endif - G_verbose_message(_("Creating support files for %s"), output); + G_verbose_message(_("Creating support files for <%s>..."), output); Rast_short_history(output, "virtual", &history); Rast_command_history(&history); Rast_format_history(&history, HIST_KEYWRD, diff --git a/raster/r.buildvrt/main.c b/raster/r.buildvrt/main.c index af537535312..134bf2d951b 100644 --- a/raster/r.buildvrt/main.c +++ b/raster/r.buildvrt/main.c @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) else { in = fopen(parm.file->answer, "r"); if (!in) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), parm.file->answer); } diff --git a/raster/r.carve/main.c b/raster/r.carve/main.c index 503413407f1..ee7b580e8b8 100644 --- a/raster/r.carve/main.c +++ b/raster/r.carve/main.c @@ -151,10 +151,11 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&Map, parm.invect->answer, vmapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), parm.invect->answer); + G_fatal_error(_("Unable to open vector map <%s>."), + parm.invect->answer); if ((rmapset = G_find_file2("cell", parm.inrast->answer, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.inrast->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.inrast->answer); infd = Rast_open_old(parm.inrast->answer, rmapset); diff --git a/raster/r.carve/vect.c b/raster/r.carve/vect.c index 7cb1b201c28..0ea85c7ed1f 100644 --- a/raster/r.carve/vect.c +++ b/raster/r.carve/vect.c @@ -24,7 +24,7 @@ int open_new_vect(struct Map_info *map, char *vect) { if (Vect_open_new(map, vect, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), vect); + G_fatal_error(_("Unable to create vector map <%s>."), vect); Vect_set_map_name(map, vect); Vect_set_comment(map, G_recreate_command()); diff --git a/raster/r.category/main.c b/raster/r.category/main.c index 78a081086c4..10a6e6cf2ef 100644 --- a/raster/r.category/main.c +++ b/raster/r.category/main.c @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) mapset = G_find_raster2(name, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); map_type = Rast_map_type(name, mapset); @@ -199,7 +199,7 @@ int main(int argc, char *argv[]) cmapset = G_find_raster2(parm.raster->answer, ""); if (cmapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), parm.raster->answer); fd = Rast_open_old(name, mapset); @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) else { fp = fopen(parm.file->answer, "r"); if (!fp) - G_fatal_error(_("Unable to open file <%s>"), + G_fatal_error(_("Unable to open file '%s'."), parm.file->answer); } diff --git a/raster/r.clump/clump.c b/raster/r.clump/clump.c index 442a38b6676..7569a8aad9f 100644 --- a/raster/r.clump/clump.c +++ b/raster/r.clump/clump.c @@ -225,7 +225,7 @@ CELL clump(int *in_fd, int out_fd, int diag, int minsize) /* temp file for initial clump IDs */ cname = G_tempfile(); if ((cfd = open(cname, O_RDWR | O_CREAT | O_EXCL, 0600)) < 0) - G_fatal_error(_("Unable to open temp file")); + G_fatal_error(_("Unable to open temp file.")); csize = ncols * sizeof(CELL); time(&cur_time); @@ -494,7 +494,7 @@ CELL clump_n(int *in_fd, char **inname, int nin, double threshold, int out_fd, /* temp file for initial clump IDs */ cname = G_tempfile(); if ((cfd = open(cname, O_RDWR | O_CREAT | O_EXCL, 0600)) < 0) - G_fatal_error(_("Unable to open temp file")); + G_fatal_error(_("Unable to open temp file.")); csize = ncols * sizeof(CELL); time(&cur_time); diff --git a/raster/r.clump/minsize.c b/raster/r.clump/minsize.c index 76baf37c2df..e2bd92ee793 100644 --- a/raster/r.clump/minsize.c +++ b/raster/r.clump/minsize.c @@ -395,7 +395,7 @@ int merge_small_clumps(int *in_fd, int nin, DCELL *rng, int diag, int minsize, /* temp file for input map(s) */ bname = G_tempfile(); if ((bfd = open(bname, O_RDWR | O_CREAT | O_EXCL, 0600)) < 0) - G_fatal_error(_("Unable to open temp file")); + G_fatal_error(_("Unable to open temp file.")); inbuf = G_malloc(sizeof(DCELL *) * nin); for (i = 0; i < nin; i++) diff --git a/raster/r.coin/main.c b/raster/r.coin/main.c index 4ad01b0f6f9..b742af8d76c 100644 --- a/raster/r.coin/main.c +++ b/raster/r.coin/main.c @@ -113,9 +113,9 @@ int main(int argc, char *argv[]) map2name = parm.map2->answer; if (!G_find_raster2(map1name, "")) - G_fatal_error(_("Raster map <%s> not found"), map1name); + G_fatal_error(_("Raster map <%s> not found."), map1name); if (!G_find_raster2(map2name, "")) - G_fatal_error(_("Raster map <%s> not found"), map2name); + G_fatal_error(_("Raster map <%s> not found."), map2name); make_coin(); print_coin(*parm.units->answer, flag.w->answer ? 132 : 80, 0); diff --git a/raster/r.colors.out/raster3d_main.c b/raster/r.colors.out/raster3d_main.c index 1d8f0aaceee..ef3a453a686 100644 --- a/raster/r.colors.out/raster3d_main.c +++ b/raster/r.colors.out/raster3d_main.c @@ -80,7 +80,7 @@ int main(int argc, char **argv) else { fp = fopen(file, "w"); if (!fp) - G_fatal_error(_("Unable to open output file <%s>"), file); + G_fatal_error(_("Unable to open output file '%s'."), file); } if (strcmp(opt.format->answer, "json") == 0) { diff --git a/raster/r.colors.out/raster_main.c b/raster/r.colors.out/raster_main.c index 1548efebdae..92001ac6e63 100644 --- a/raster/r.colors.out/raster_main.c +++ b/raster/r.colors.out/raster_main.c @@ -79,7 +79,7 @@ int main(int argc, char **argv) else { fp = fopen(file, "w"); if (!fp) - G_fatal_error(_("Unable to open output file <%s>"), file); + G_fatal_error(_("Unable to open output file '%s'."), file); } if (strcmp(opt.format->answer, "json") == 0) { diff --git a/raster/r.colors/edit_colors.c b/raster/r.colors/edit_colors.c index 8ae4873c427..1558cbc4d23 100644 --- a/raster/r.colors/edit_colors.c +++ b/raster/r.colors/edit_colors.c @@ -500,7 +500,7 @@ int edit_colors(int argc, char **argv, int type, const char *maptype, if (opt.rast->answer) { cmapset = G_find_raster2(cmap, ""); if (cmapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), cmap); + G_fatal_error(_("Raster map <%s> not found."), cmap); if (Rast_read_colors(cmap, cmapset, &colors) < 0) G_fatal_error( @@ -509,7 +509,7 @@ int edit_colors(int argc, char **argv, int type, const char *maptype, else { cmapset = G_find_raster3d(cmap, ""); if (cmapset == NULL) - G_fatal_error(_("3D raster map <%s> not found"), cmap); + G_fatal_error(_("3D raster map <%s> not found."), cmap); if (Rast3d_read_colors(cmap, cmapset, &colors) < 0) G_fatal_error( diff --git a/raster/r.colors/stats.c b/raster/r.colors/stats.c index bc0447e1c0f..da24eb46958 100644 --- a/raster/r.colors/stats.c +++ b/raster/r.colors/stats.c @@ -119,7 +119,7 @@ void get_fp_stats(struct maps_info *input_maps, struct FP_stats *statf, RASTER3D_USE_CACHE_DEFAULT); if (map3d == NULL) - Rast3d_fatal_error(_("Error opening 3d raster map")); + Rast3d_fatal_error(_("Error opening 3D raster map.")); nrows = map3d->window.rows; ncols = map3d->window.cols; diff --git a/raster/r.compress/main.c b/raster/r.compress/main.c index 555deefcd32..23c6c53b39d 100644 --- a/raster/r.compress/main.c +++ b/raster/r.compress/main.c @@ -121,7 +121,7 @@ static int process(char *name, int uncompress) mapset = G_find_raster(name, G_mapset()); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), name); + G_warning(_("Raster map <%s> not found."), name); return 1; } if (strcmp(mapset, G_mapset())) { @@ -327,7 +327,7 @@ static int pprint(char *name, int shell_style) mapset = G_find_raster(name, G_mapset()); if (mapset == NULL) { - G_warning(_("Raster map <%s> not found"), name); + G_warning(_("Raster map <%s> not found."), name); return 1; } if (strcmp(mapset, G_mapset())) { diff --git a/raster/r.contour/main.c b/raster/r.contour/main.c index 9ac12f6d20a..fba702bdbb9 100644 --- a/raster/r.contour/main.c +++ b/raster/r.contour/main.c @@ -149,7 +149,7 @@ int main(int argc, char *argv[]) G_get_window(&Wind); if (Vect_open_new(&Map, vect->answer, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), vect->answer); + G_fatal_error(_("Unable to create vector map <%s>."), vect->answer); Vect_hist_command(&Map); @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) G_debug(1, "SQL: %s", db_get_string(&sql)); if (db_execute_immediate(Driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: '%s'"), + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } @@ -209,7 +209,7 @@ int main(int argc, char *argv[]) G_debug(3, "SQL: %s", db_get_string(&sql)); if (db_execute_immediate(Driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to insert new record: '%s'"), + G_fatal_error(_("Unable to insert new record: '%s'."), db_get_string(&sql)); } } diff --git a/raster/r.cost/flag.c b/raster/r.cost/flag.c index 3cfed9ec2ff..8d01acff64e 100644 --- a/raster/r.cost/flag.c +++ b/raster/r.cost/flag.c @@ -18,13 +18,13 @@ FLAG *flag_create(int nrows, int ncols) (unsigned char **)G_malloc(nrows * sizeof(unsigned char *)); if (!new_flag->array) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); temp = (unsigned char *)G_malloc((size_t)nrows * new_flag->leng * sizeof(unsigned char)); if (!temp) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); for (i = 0; i < nrows; i++) { new_flag->array[i] = temp; diff --git a/raster/r.cost/main.c b/raster/r.cost/main.c index 8b01bd4b7b0..73db3f5c343 100644 --- a/raster/r.cost/main.c +++ b/raster/r.cost/main.c @@ -358,7 +358,7 @@ int main(int argc, char *argv[]) if (dir && opt_solve->answer) { search_mapset = G_find_raster2(opt_solve->answer, ""); if (search_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), opt_solve->answer); + G_fatal_error(_("Raster map <%s> not found."), opt_solve->answer); have_solver = 1; } @@ -385,7 +385,7 @@ int main(int argc, char *argv[]) /* Open cost cell layer for reading */ cost_mapset = G_find_raster2(cost_layer, ""); if (cost_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), cost_layer); + G_fatal_error(_("Raster map <%s> not found."), cost_layer); cost_fd = Rast_open_old(cost_layer, cost_mapset); data_type = Rast_get_map_type(cost_fd); @@ -593,7 +593,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); /* topology not required */ if (1 > Vect_open_old(&In, opt7->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), opt7->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt7->answer); G_message(_("Reading vector map <%s> with start points..."), Vect_get_full_name(&In)); @@ -660,7 +660,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); /* topology not required */ if (1 > Vect_open_old(&In, opt8->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), opt8->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt8->answer); Vect_rewind(&In); @@ -705,7 +705,7 @@ int main(int argc, char *argv[]) search_mapset = G_find_raster(opt9->answer, ""); if (search_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), opt9->answer); + G_fatal_error(_("Raster map <%s> not found."), opt9->answer); fd = Rast_open_old(opt9->answer, search_mapset); data_type2 = Rast_get_map_type(fd); diff --git a/raster/r.cross/main.c b/raster/r.cross/main.c index 22b76c0d718..a1f5329eb67 100644 --- a/raster/r.cross/main.c +++ b/raster/r.cross/main.c @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("More than %d files not allowed"), NFILES); mapset = G_find_raster2(name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); names[nfiles] = name; fd[nfiles] = Rast_open_old(name, mapset); } diff --git a/raster/r.describe/describe.c b/raster/r.describe/describe.c index 41d1fd63732..b8e56c49bed 100644 --- a/raster/r.describe/describe.c +++ b/raster/r.describe/describe.c @@ -88,7 +88,7 @@ int describe(const char *name, int compact, char *no_data_str, int range, nrows = Rast_window_rows(); ncols = Rast_window_cols(); - G_verbose_message(_("Reading <%s> ..."), name); + G_verbose_message(_("Reading <%s>..."), name); for (row = 0; row < nrows; row++) { G_percent(row, nrows, 2); (*get_row)(fd, b = buf, row); diff --git a/raster/r.distance/parse.c b/raster/r.distance/parse.c index 1f5717dbef8..a7d3752e009 100644 --- a/raster/r.distance/parse.c +++ b/raster/r.distance/parse.c @@ -70,7 +70,7 @@ void parse(int argc, char *argv[], struct Parms *parms) name = parms->map1.name = maps->answers[0]; mapset = parms->map1.mapset = G_find_raster2(name, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); if (Rast_map_type(name, mapset) != CELL_TYPE) G_fatal_error(_("Raster map <%s> is not CELL"), name); @@ -79,7 +79,7 @@ void parse(int argc, char *argv[], struct Parms *parms) name = parms->map2.name = maps->answers[1]; mapset = parms->map2.mapset = G_find_raster2(name, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); if (Rast_map_type(name, mapset) != CELL_TYPE) G_fatal_error(_("Raster map <%s> is not CELL"), name); diff --git a/raster/r.drain/main.c b/raster/r.drain/main.c index aacb04b56af..f80dd52a176 100644 --- a/raster/r.drain/main.c +++ b/raster/r.drain/main.c @@ -198,7 +198,7 @@ int main(int argc, char **argv) if (opt4->answer) { if (0 > Vect_open_new(&vout, opt4->answer, 0)) { - G_fatal_error(_("Unable to create vector map <%s>"), opt4->answer); + G_fatal_error(_("Unable to create vector map <%s>."), opt4->answer); } Vect_hist_command(&vout); } @@ -271,7 +271,7 @@ int main(int argc, char **argv) Vect_set_open_level(1); /* topology not required */ if (1 > Vect_open_old(&In, vpointopt->answers[i], "")) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), vpointopt->answers[i]); G_message(_("Reading vector map <%s> with start points..."), diff --git a/raster/r.external/link.c b/raster/r.external/link.c index 08fb1c466f0..82d8727e94c 100644 --- a/raster/r.external/link.c +++ b/raster/r.external/link.c @@ -217,7 +217,7 @@ void create_map(const char *input, int band, const char *output, write_fp_quant(output); } - G_verbose_message(_("Creating support files for %s"), output); + G_verbose_message(_("Creating support files for <%s>..."), output); Rast_short_history(output, "GDAL-link", &history); Rast_command_history(&history); snprintf(buf, sizeof(buf), "%s band %d", input, band); diff --git a/raster/r.external/proj.c b/raster/r.external/proj.c index 534e330a9c4..947eda6a6ce 100644 --- a/raster/r.external/proj.c +++ b/raster/r.external/proj.c @@ -145,7 +145,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, srid, wkt)) { - G_fatal_error(_("Unable to create new project <%s>"), outloc); + G_fatal_error(_("Unable to create new project <%s>."), outloc); } G_message(_("Project <%s> created"), outloc); @@ -317,8 +317,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, msg_fn = G_message; else msg_fn = G_verbose_message; - msg_fn(_("Coordinate reference system of input dataset and current " - "project appear to match")); + msg_fn(_("Coordinate reference system of input dataset and " + "current project appear to match.")); if (check_only) { GDALClose(hDS); diff --git a/raster/r.fill.stats/main.c b/raster/r.fill.stats/main.c index 16cd0d3d64e..7f3ca950f17 100644 --- a/raster/r.fill.stats/main.c +++ b/raster/r.fill.stats/main.c @@ -1022,7 +1022,7 @@ int main(int argc, char *argv[]) /* open raster input map and get its storage type */ mapset = G_find_raster(input, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), input); + G_fatal_error(_("Raster map <%s> not found."), input); Rast_get_cellhd(input, mapset, &cellhd); in_fd = Rast_open_old(input, mapset); IN_TYPE = Rast_get_map_type(in_fd); diff --git a/raster/r.flow/flow_io.c b/raster/r.flow/flow_io.c index dc5554ee9be..8f5303f981c 100644 --- a/raster/r.flow/flow_io.c +++ b/raster/r.flow/flow_io.c @@ -64,7 +64,7 @@ static int open_existing_cell_file(char *fname, struct Cell_head *chd) const char *mapset = G_find_raster(fname, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), fname); + G_fatal_error(_("Raster map <%s> not found."), fname); if (chd) Rast_get_cellhd(fname, mapset, chd); @@ -178,7 +178,7 @@ void open_output_files(void) lgfd = Rast_open_new(parm.lgout, FCELL_TYPE); if (parm.flout && (Vect_open_new(&fl, parm.flout, 0) < 0)) - G_fatal_error(_("Unable to create vector map <%s>"), parm.flout); + G_fatal_error(_("Unable to create vector map <%s>."), parm.flout); } void close_files(void) @@ -242,7 +242,7 @@ void write_density_file(void) Rast_add_c_color_rule(&val1, 0, 0, 255, &val2, 0, 0, 0, &colors); if ((mapset = G_find_file("cell", parm.dsout, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.dsout); + G_fatal_error(_("Raster map <%s> not found."), parm.dsout); Rast_write_colors(parm.dsout, mapset, &colors); Rast_free_colors(&colors); diff --git a/raster/r.geomorphon/main.c b/raster/r.geomorphon/main.c index 853512598bc..eaf0543601b 100644 --- a/raster/r.geomorphon/main.c +++ b/raster/r.geomorphon/main.c @@ -247,12 +247,12 @@ int main(int argc, char **argv) if (oneoff) { if (!G_scan_easting(par_coords->answers[0], &oneoff_easting, G_projection())) - G_fatal_error(_("Illegal east coordinate <%s>"), + G_fatal_error(_("Illegal east coordinate <%s>."), par_coords->answers[0]); oneoff_col = Rast_easting_to_col(oneoff_easting, &window); if (!G_scan_northing(par_coords->answers[1], &oneoff_northing, G_projection())) - G_fatal_error(_("Illegal north coordinate <%s>"), + G_fatal_error(_("Illegal north coordinate <%s>."), par_coords->answers[1]); oneoff_row = Rast_northing_to_row(oneoff_northing, &window); if (oneoff_row < 0 || oneoff_row >= nrows || oneoff_col < 0 || diff --git a/raster/r.geomorphon/memory.c b/raster/r.geomorphon/memory.c index 64aab12271a..b8304dc9386 100644 --- a/raster/r.geomorphon/memory.c +++ b/raster/r.geomorphon/memory.c @@ -41,7 +41,7 @@ int open_map(MAPS *rast) mapset = (char *)G_find_raster2(rast->elevname, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), rast->elevname); + G_fatal_error(_("Raster map <%s> not found."), rast->elevname); rast->fd = Rast_open_old(rast->elevname, mapset); Rast_get_cellhd(rast->elevname, mapset, &cellhd); diff --git a/raster/r.horizon/main.c b/raster/r.horizon/main.c index 57a8531e215..83f9e1271cb 100644 --- a/raster/r.horizon/main.c +++ b/raster/r.horizon/main.c @@ -427,7 +427,7 @@ int main(int argc, char *argv[]) fp = stdout; } else if (NULL == (fp = fopen(outfile, "w"))) - G_fatal_error(_("Unable to open file <%s>"), outfile); + G_fatal_error(_("Unable to open file '%s'."), outfile); } settings.single_direction = 0; if (parm.direction->answer != NULL) diff --git a/raster/r.in.bin/main.c b/raster/r.in.bin/main.c index 21a6f4d1445..b58e257e454 100644 --- a/raster/r.in.bin/main.c +++ b/raster/r.in.bin/main.c @@ -429,10 +429,10 @@ int main(int argc, char *argv[]) nbands = atoi(parm.bands->answer); if (nbands < 1) - G_fatal_error(_("Option %s must be > 0"), parm.bands->key); + G_fatal_error(_("Option <%s> must be > 0."), parm.bands->key); hbytes = atoi(parm.hbytes->answer); if (hbytes < 0) - G_fatal_error(_("Option %s must be >= 0"), parm.hbytes->key); + G_fatal_error(_("Option <%s> must be >= 0."), parm.hbytes->key); if (G_strcasecmp(parm.order->answer, "big") == 0) order = 0; @@ -542,14 +542,14 @@ int main(int argc, char *argv[]) if (num_bounds > 0) { if (!G_scan_northing(parm.north->answer, &cellhd.north, cellhd.proj)) - G_fatal_error(_("Illegal north coordinate <%s>"), + G_fatal_error(_("Illegal north coordinate <%s>."), parm.north->answer); if (!G_scan_northing(parm.south->answer, &cellhd.south, cellhd.proj)) G_fatal_error(_("Illegal south coordinate <%s>"), parm.south->answer); if (!G_scan_easting(parm.east->answer, &cellhd.east, cellhd.proj)) - G_fatal_error(_("Illegal east coordinate <%s>"), + G_fatal_error(_("Illegal east coordinate <%s>."), parm.east->answer); if (!G_scan_easting(parm.west->answer, &cellhd.west, cellhd.proj)) G_fatal_error(_("Illegal west coordinate <%s>"), diff --git a/raster/r.in.gdal/main.c b/raster/r.in.gdal/main.c index c5eceb3ad92..9f1081bda4b 100644 --- a/raster/r.in.gdal/main.c +++ b/raster/r.in.gdal/main.c @@ -519,7 +519,7 @@ int main(int argc, char *argv[]) _("Raster map <%s> already exists and will be overwritten"), output); else - G_fatal_error(_("Raster map <%s> already exists"), output); + G_fatal_error(_("Raster map <%s> already exists."), output); } } @@ -831,7 +831,7 @@ int main(int argc, char *argv[]) "be overwritten"), szBandName); else - G_fatal_error(_("Raster map <%s> already exists"), + G_fatal_error(_("Raster map <%s> already exists."), szBandName); } } @@ -1022,7 +1022,7 @@ int main(int argc, char *argv[]) if (0 != G_make_location_crs( parm.target->answer, &gcpcellhd, proj_info, proj_units, gdalsrid, gdalwkt)) { - G_fatal_error(_("Unable to create new project <%s>"), + G_fatal_error(_("Unable to create new project <%s>."), parm.target->answer); } /* switch back to import location */ @@ -1950,7 +1950,7 @@ static int dump_rat(GDALRasterBandH hBand, char *outrat, int nBand) if (!(fp = fopen(fname, "w"))) { int err = errno; - G_fatal_error(_("Unable to open file <%s>: %s."), fname, strerror(err)); + G_fatal_error(_("Unable to open file '%s': %s."), fname, strerror(err)); } /* dump column names and usage */ diff --git a/raster/r.in.gdal/proj.c b/raster/r.in.gdal/proj.c index 9d70418f020..73a2ab02fa5 100644 --- a/raster/r.in.gdal/proj.c +++ b/raster/r.in.gdal/proj.c @@ -145,7 +145,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, srid, wkt)) { - G_fatal_error(_("Unable to create new project <%s>"), outloc); + G_fatal_error(_("Unable to create new project <%s>."), outloc); } G_message(_("Project <%s> created"), outloc); @@ -317,8 +317,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, msg_fn = G_message; else msg_fn = G_verbose_message; - msg_fn(_("Coordinate reference system of input dataset and current " - "project appear to match")); + msg_fn(_("Coordinate reference system of input dataset and " + "current project appear to match.")); if (check_only) { GDALClose(hDS); diff --git a/raster/r.in.lidar/main.c b/raster/r.in.lidar/main.c index f4d6503c732..e63e12d8ad4 100644 --- a/raster/r.in.lidar/main.c +++ b/raster/r.in.lidar/main.c @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) _("Variance of point values in cell"), _("Coefficient of variance of point values in cell"), _("Median value of point values in cell"), - _("pth (nth) percentile of point values in cell"), + _("Pth (nth) percentile of point values in cell"), _("Skewness of point values in cell"), _("Trimmed mean of point values in cell")); @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) pth_opt->type = TYPE_INTEGER; pth_opt->required = NO; pth_opt->options = "1-100"; - pth_opt->description = _("pth percentile of the values"); + pth_opt->description = _("Pth percentile of the values"); pth_opt->guisection = _("Statistic"); trim_opt = G_define_option(); @@ -611,8 +611,8 @@ int main(int argc, char *argv[]) if (!scan_flag->answer) { if (!check_rows_cols_fit_to_size_t(rows, cols)) G_fatal_error( - _("Unable to process the whole map at once. " - "Please set the '%s' option to some value lower than 100."), + _("Unable to process the whole map at once. Please set the " + "<%s> option to some value lower than 100."), percent_opt->key); point_binning_memory_test(&point_binning, rows, cols, rtype); } @@ -665,7 +665,7 @@ int main(int argc, char *argv[]) /* we already know file is there, so just do basic checks */ LAS_reader = LASReader_Create(infile); if (LAS_reader == NULL) - G_fatal_error(_("Unable to open file <%s>"), infile); + G_fatal_error(_("Unable to open file '%s'."), infile); while ((LAS_point = LASReader_GetNextPoint(LAS_reader)) != NULL) { line++; diff --git a/raster/r.in.lidar/projection.c b/raster/r.in.lidar/projection.c index 20f585bc616..95891e802b2 100644 --- a/raster/r.in.lidar/projection.c +++ b/raster/r.in.lidar/projection.c @@ -131,8 +131,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, loc_proj_units, proj_info, proj_units, err); } else if (verbose) { - G_message(_( - "Coordinate reference system of input dataset and current project " - "appear to match")); + G_message(_("Coordinate reference system of input dataset and current " + "project appear to match.")); } } diff --git a/raster/r.in.mat/main.c b/raster/r.in.mat/main.c index 24402042fe5..b527fe48c0a 100644 --- a/raster/r.in.mat/main.c +++ b/raster/r.in.mat/main.c @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) /* open bin file for reading */ fp1 = fopen(infile, "rb"); if (NULL == fp1) - G_fatal_error(_("Unable to open input file <%s>"), infile); + G_fatal_error(_("Unable to open input file '%s'."), infile); have_name = have_data = have_title = 0; have_n = have_s = have_e = have_w = 0; diff --git a/raster/r.in.pdal/filters.c b/raster/r.in.pdal/filters.c index 79593885a42..51474e2ee72 100644 --- a/raster/r.in.pdal/filters.c +++ b/raster/r.in.pdal/filters.c @@ -62,7 +62,7 @@ int range_filter_from_option(struct Option *option, double *min, double *max) { if (option->answer != NULL) { if (option->answers[0] == NULL || option->answers[1] == NULL) - G_fatal_error(_("Invalid range <%s> for option <%s>"), + G_fatal_error(_("Invalid range <%s> for option <%s>."), option->answer, option->key); sscanf(option->answers[0], "%lf", min); sscanf(option->answers[1], "%lf", max); diff --git a/raster/r.in.pdal/main.cpp b/raster/r.in.pdal/main.cpp index 391020edaf1..c1701c8223a 100644 --- a/raster/r.in.pdal/main.cpp +++ b/raster/r.in.pdal/main.cpp @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) _("Coefficient of variance of point values in cell"), _("Median value of point values in cell"), _("Mode value of point values in cell"), - _("pth (nth) percentile of point values in cell"), + _("Pth (nth) percentile of point values in cell"), _("Skewness of point values in cell"), _("Trimmed mean of point values in cell"), _("Maximum number of points in cell per source ID"), @@ -276,7 +276,7 @@ int main(int argc, char *argv[]) pth_opt->type = TYPE_INTEGER; pth_opt->required = NO; pth_opt->options = "1-100"; - pth_opt->description = _("pth percentile of the values"); + pth_opt->description = _("Pth percentile of the values"); pth_opt->guisection = _("Statistic"); Option *trim_opt = G_define_option(); diff --git a/raster/r.in.pdal/projection.c b/raster/r.in.pdal/projection.c index c67bdcfef28..c2b62b7246e 100644 --- a/raster/r.in.pdal/projection.c +++ b/raster/r.in.pdal/projection.c @@ -128,7 +128,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, else { if (verbose) { G_message(_("Coordinate reference system of input dataset and " - "current project appear to match")); + "current project appear to match.")); } } } diff --git a/raster/r.in.poly/main.c b/raster/r.in.poly/main.c index f9f790e37cb..169794f8480 100644 --- a/raster/r.in.poly/main.c +++ b/raster/r.in.poly/main.c @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) _("Creates raster maps from ASCII polygon/line/point data files."); input = G_define_standard_option(G_OPT_F_INPUT); - input->description = _("Name of input file; or \"-\" to read from stdin"); + input->description = _("Name of input file (or \"-\" to read from stdin)"); output = G_define_standard_option(G_OPT_R_OUTPUT); diff --git a/raster/r.in.poly/poly2rast.c b/raster/r.in.poly/poly2rast.c index bb707d03e25..92bb3942f44 100644 --- a/raster/r.in.poly/poly2rast.c +++ b/raster/r.in.poly/poly2rast.c @@ -53,7 +53,7 @@ int poly_to_rast(char *input_file, char *raster_map, char *title, int nrows, do { pass++; if (npasses > 1) - G_message(_("Pass #%d (of %d) ..."), pass, npasses); + G_message(_("Pass #%d (of %d)..."), pass, npasses); G_fseek(ifd, 0L, 0); while (get_item(ifd, format, &type, &cat_int, &cat_double, &x, &y, diff --git a/raster/r.in.xyz/main.c b/raster/r.in.xyz/main.c index beae3386181..766e6a50921 100644 --- a/raster/r.in.xyz/main.c +++ b/raster/r.in.xyz/main.c @@ -249,7 +249,7 @@ int main(int argc, char *argv[]) zrange_opt->type = TYPE_DOUBLE; zrange_opt->required = NO; zrange_opt->key_desc = "min,max"; - zrange_opt->description = _("Filter range for z data (min,max)"); + zrange_opt->description = _("Filter range for Z data (min,max)"); zrange_opt->guisection = _("Advanced Input"); zscale_opt = G_define_option(); @@ -257,7 +257,7 @@ int main(int argc, char *argv[]) zscale_opt->type = TYPE_DOUBLE; zscale_opt->required = NO; zscale_opt->answer = "1.0"; - zscale_opt->description = _("Scale to apply to z data"); + zscale_opt->description = _("Scale to apply to Z data"); zscale_opt->guisection = _("Advanced Input"); vcol_opt = G_define_option(); @@ -532,8 +532,8 @@ int main(int argc, char *argv[]) if (dsize != (size_t)rows * (cols + 1)) G_fatal_error( - _("Unable to process the whole map at once. " - "Please set the %s option to some value lower than 100."), + _("Unable to process the whole map at once. Please set " + "the <%s> option to some value lower than 100."), percent_opt->key); } /* allocate memory (test for enough before we start) */ @@ -582,7 +582,7 @@ int main(int argc, char *argv[]) else { from_stdin = FALSE; if ((in_fp = fopen(infile, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), infile); + G_fatal_error(_("Unable to open input file '%s'."), infile); } can_seek = fseek(in_fp, 0L, SEEK_SET) == 0; @@ -648,7 +648,7 @@ int main(int argc, char *argv[]) /* main binning loop(s) */ for (pass = 1; pass <= npasses; pass++) { if (npasses > 1) - G_message(_("Pass #%d (of %d) ..."), pass, npasses); + G_message(_("Pass #%d (of %d)..."), pass, npasses); if (can_seek) { rewind(in_fp); diff --git a/raster/r.info/main.c b/raster/r.info/main.c index 74f73f2ce9b..52e95f4eaf6 100644 --- a/raster/r.info/main.c +++ b/raster/r.info/main.c @@ -134,7 +134,7 @@ int main(int argc, char **argv) name = G_store(opt1->answer); if ((mapset = G_find_raster2(name, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); if (strcmp(fopt->answer, "json") == 0) { format = JSON; diff --git a/raster/r.kappa/main.c b/raster/r.kappa/main.c index 6a821392cdb..76ba4241bf6 100644 --- a/raster/r.kappa/main.c +++ b/raster/r.kappa/main.c @@ -167,7 +167,7 @@ static void layer(const char *s) G_fatal_error(_("Raster map name <%s> is too long"), s); } if ((mapset = G_find_raster2(name, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), s); + G_fatal_error(_("Raster map <%s> not found."), s); n = nlayers++; layers = (LAYER *)G_realloc(layers, 2 * sizeof(LAYER)); diff --git a/raster/r.kappa/stats.c b/raster/r.kappa/stats.c index 9bfa9401682..2baee0f8053 100644 --- a/raster/r.kappa/stats.c +++ b/raster/r.kappa/stats.c @@ -30,14 +30,14 @@ int stats(void) } mmapset = G_find_raster2(mname, ""); if (mmapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), maps[0]); + G_fatal_error(_("Raster map <%s> not found."), maps[0]); if (G_strlcpy(rname, maps[0], sizeof(rname)) >= sizeof(rname)) { G_fatal_error(_("Raster map name <%s> is too long"), maps[0]); } rmapset = G_find_raster2(rname, ""); if (rmapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), maps[1]); + G_fatal_error(_("Raster map <%s> not found."), maps[1]); stats_file = G_tempfile(); diff --git a/raster/r.li/r.li.daemon/list.c b/raster/r.li/r.li.daemon/list.c index 094db21daa2..686b8807d1b 100644 --- a/raster/r.li/r.li.daemon/list.c +++ b/raster/r.li/r.li.daemon/list.c @@ -29,10 +29,10 @@ void insertNode(struct list *l, msg mess) new = G_malloc(sizeof(struct node)); if (new == NULL) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); new->m = G_malloc(sizeof(msg)); if (new->m == NULL) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); memcpy(new->m, &mess, sizeof(msg)); new->next = new->prev = NULL; diff --git a/raster/r.mapcalc/expression.c b/raster/r.mapcalc/expression.c index 6492837e9fc..3497e595720 100644 --- a/raster/r.mapcalc/expression.c +++ b/raster/r.mapcalc/expression.c @@ -202,7 +202,7 @@ expression *variable(const char *name) expression *e; if (!var) - syntax_error(_("Undefined variable '%s'"), name); + syntax_error(_("Undefined variable <%s>."), name); e = allocate(expr_type_variable, var ? var->res_type : CELL_TYPE); e->data.var.name = name; diff --git a/raster/r.mapcalc/main.c b/raster/r.mapcalc/main.c index 522fdddde7b..14a7f5e24b0 100644 --- a/raster/r.mapcalc/main.c +++ b/raster/r.mapcalc/main.c @@ -46,7 +46,7 @@ static expr_list *parse_file(const char *filename) fp = fopen(filename, "r"); if (!fp) - G_fatal_error(_("Unable to open input file <%s>"), filename); + G_fatal_error(_("Unable to open input file '%s'."), filename); res = parse_stream(fp); diff --git a/raster/r.mapcalc/map.c b/raster/r.mapcalc/map.c index a336e4200d4..7fd82ca9587 100644 --- a/raster/r.mapcalc/map.c +++ b/raster/r.mapcalc/map.c @@ -510,7 +510,7 @@ int open_map(const char *name, int mod, int row, int col, int thread_num) mapset = G_find_raster2(name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); switch (mod) { case 'M': @@ -814,7 +814,7 @@ void prepare_region_from_maps(expression **map_list, int type, int num_maps) mapset = G_find_raster2(rast_name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), rast_name); + G_fatal_error(_("Raster map <%s> not found."), rast_name); G_debug(1, "Setting region from raster map: %s@%s", rast_name, mapset); diff --git a/raster/r.mapcalc/map3.c b/raster/r.mapcalc/map3.c index e15d0598c5b..1a6c6bf6ecc 100644 --- a/raster/r.mapcalc/map3.c +++ b/raster/r.mapcalc/map3.c @@ -718,7 +718,7 @@ void prepare_region_from_maps(expression **map_list, int type, int num_maps) mapset = G_find_raster2(rast_name, ""); if (!mapset) - G_fatal_error(_("Raster map <%s> not found"), rast_name); + G_fatal_error(_("Raster map <%s> not found."), rast_name); G_debug(1, "Setting region from raster map: %s@%s", rast_name, mapset); diff --git a/raster/r.mfilter/perform.c b/raster/r.mfilter/perform.c index b4a22583434..50f7e2c43ed 100644 --- a/raster/r.mfilter/perform.c +++ b/raster/r.mfilter/perform.c @@ -103,7 +103,7 @@ int perform_filter(const char *in_name, const char *out_name, FILTER *filter, in[MASTER] = out[MASTER]; out[MASTER] = Rast_open_fp_new(out_name); - G_message(_("Writing raster map <%s>"), out_name); + G_message(_("Writing raster map <%s>..."), out_name); for (row = 0; row < nrows; row++) { getrow(in[MASTER], cell[MASTER], row, buflen); Rast_put_d_row(out[MASTER], cell[MASTER]); diff --git a/raster/r.mode/main.c b/raster/r.mode/main.c index 4e49ec19dff..46fdc7ff8b1 100644 --- a/raster/r.mode/main.c +++ b/raster/r.mode/main.c @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) G_popen_close(&stats_child); if (Rast_read_colors(parm.cover->answer, "", &colors) < 0) - G_fatal_error(_("Unable to read color table for %s"), + G_fatal_error(_("Unable to read color table for <%s>."), parm.cover->answer); Rast_write_colors(parm.output->answer, G_mapset(), &colors); diff --git a/raster/r.null/main.c b/raster/r.null/main.c index 0e7c958f6d1..9528d65332b 100644 --- a/raster/r.null/main.c +++ b/raster/r.null/main.c @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) name = parms.map->answer; mapset = G_find_raster2(name, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), name); + G_fatal_error(_("Raster map <%s> not found."), name); is_reclass = (Rast_is_reclass(name, mapset, rname, rmapset) > 0); if (is_reclass) diff --git a/raster/r.object.geometry/main.c b/raster/r.object.geometry/main.c index e40330ee9d2..f2fa7ef2869 100644 --- a/raster/r.object.geometry/main.c +++ b/raster/r.object.geometry/main.c @@ -108,11 +108,11 @@ int main(int argc, char *argv[]) in_fd = Rast_open_old(opt_in->answer, ""); if (Rast_get_map_type(in_fd) != CELL_TYPE) - G_fatal_error(_("Input raster must be of type CELL")); + G_fatal_error(_("Input raster must be of type CELL.")); if (opt_out->answer != NULL && strcmp(opt_out->answer, "-") != 0) { if (!(out_fp = fopen(opt_out->answer, "w"))) - G_fatal_error(_("Unable to open file <%s> for writing"), + G_fatal_error(_("Unable to open file '%s' for writing."), opt_out->answer); } else { diff --git a/raster/r.out.ascii/main.c b/raster/r.out.ascii/main.c index 47fc762eabd..7b18d9fcc4b 100644 --- a/raster/r.out.ascii/main.c +++ b/raster/r.out.ascii/main.c @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) if (parm.dp->answer) { if (sscanf(parm.dp->answer, "%d", &dp) != 1) - G_fatal_error(_("Failed to interpret dp as an integer")); + G_fatal_error(_("Failed to interpret dp as an integer.")); if (dp > 20 || dp < 0) G_fatal_error(_("dp has to be from 0 to 20")); } @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) /* open ascii file for writing or use stdout */ if (parm.output->answer && strcmp("-", parm.output->answer) != 0) { if (NULL == (fp = fopen(parm.output->answer, "w"))) - G_fatal_error(_("Unable to open file <%s>"), parm.output->answer); + G_fatal_error(_("Unable to open file '%s'."), parm.output->answer); } else fp = stdout; @@ -162,7 +162,7 @@ int main(int argc, char *argv[]) if (flag.surfer->answer) { if (!flag.noheader->answer) { if (writeGSheader(fp, name)) - G_fatal_error(_("Unable to read fp range for <%s>"), name); + G_fatal_error(_("Unable to read FP range for <%s>."), name); } rc = write_GSGRID(fd, fp, nrows, ncols, out_type, dp, surfer_null_str, width); diff --git a/raster/r.out.gdal/main.c b/raster/r.out.gdal/main.c index 4651e8e680c..162a5a6ede7 100644 --- a/raster/r.out.gdal/main.c +++ b/raster/r.out.gdal/main.c @@ -522,7 +522,7 @@ int main(int argc, char *argv[]) : (maptype == FCELL_TYPE ? "FCELL" : "??")))); if (flag_f->answer) - G_verbose_message(_("Forcing raster export")); + G_verbose_message(_("Forcing raster export.")); /* if GDAL datatype set by user and export not forced, do checks */ if (type->answer && !flag_f->answer) { diff --git a/raster/r.out.mat/main.c b/raster/r.out.mat/main.c index 37a7c10e09d..8c0adc9e9cc 100644 --- a/raster/r.out.mat/main.c +++ b/raster/r.out.mat/main.c @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) /* open bin file for writing */ fp1 = fopen(outfile, "wb"); if (NULL == fp1) - G_fatal_error(_("Unable to open output file <%s>"), outfile); + G_fatal_error(_("Unable to open output file '%s'."), outfile); /* Check Endian State of Host Computer */ if (G_is_little_endian()) diff --git a/raster/r.out.mpeg/main.c b/raster/r.out.mpeg/main.c index 845086ac677..1cd52afd9bb 100644 --- a/raster/r.out.mpeg/main.c +++ b/raster/r.out.mpeg/main.c @@ -294,7 +294,7 @@ static int load_files(void) fd = Rast_open_old(name, ""); if (Rast_read_colors(name, "", &colors) < 0) - G_fatal_error(_("Unable to read color table for <%s>"), name); + G_fatal_error(_("Unable to read color table for <%s>."), name); rtype = Rast_get_map_type(fd); voidc = Rast_allocate_buf(rtype); diff --git a/raster/r.out.mpeg/write.c b/raster/r.out.mpeg/write.c index ac596189d9b..7c7f9725ea1 100644 --- a/raster/r.out.mpeg/write.c +++ b/raster/r.out.mpeg/write.c @@ -126,7 +126,7 @@ void write_ycc(char *tr, char *tg, char *tb, int nrows, int ncols, int *y_rows, } if (NULL == (ofp = fopen(filename, "wb"))) - G_fatal_error(_("Unable to open output file")); + G_fatal_error(_("Unable to open output file.")); for (y = 0; y < rows; y++) fwrite(cy + (y * cols), 1, cols, ofp); @@ -167,7 +167,7 @@ void write_ppm(char *tr, char *tg, char *tb, int nrows, int ncols, int *y_rows, G_fatal_error(_("Size mismatch error!")); if (NULL == (ofp = fopen(filename, "w"))) - G_fatal_error(_("Unable to open output file")); + G_fatal_error(_("Unable to open output file.")); fprintf(ofp, "P6\n"); /* Magic number meaning rawbits, 24bit color to ppm format */ diff --git a/raster/r.out.png/main.c b/raster/r.out.png/main.c index b2887b7705d..42f22b44f33 100644 --- a/raster/r.out.png/main.c +++ b/raster/r.out.png/main.c @@ -198,7 +198,7 @@ int main(int argc, char *argv[]) if (do_stdout) fp = stdout; else if (NULL == (fp = fopen(outfile, "w"))) - G_fatal_error(_("Unable to open output file <%s>"), outfile); + G_fatal_error(_("Unable to open output file '%s'."), outfile); png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, &pnmtopng_jmpbuf_struct, diff --git a/raster/r.out.pov/main.c b/raster/r.out.pov/main.c index 7e231844e8a..a8d0f2b979f 100644 --- a/raster/r.out.pov/main.c +++ b/raster/r.out.pov/main.c @@ -158,7 +158,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("Invalid output filename")); if (NULL == (outf = fopen(outfilename, "wb"))) - G_fatal_error(_("Unable to open output file <%s>"), outfilename); + G_fatal_error(_("Unable to open output file '%s'."), outfilename); /* cell = Rast_allocate_c_buf(); */ diff --git a/raster/r.out.ppm/main.c b/raster/r.out.ppm/main.c index 9d74d375314..70341782bd5 100644 --- a/raster/r.out.ppm/main.c +++ b/raster/r.out.ppm/main.c @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) if (do_stdout) G_done_msg("%s", ""); else - G_done_msg(_("File <%s> created"), ofile); + G_done_msg(_("File '%s' created."), ofile); return (EXIT_SUCCESS); } diff --git a/raster/r.out.ppm3/main.c b/raster/r.out.ppm3/main.c index 0f0d0780ca5..8396b9a0651 100644 --- a/raster/r.out.ppm3/main.c +++ b/raster/r.out.ppm3/main.c @@ -79,7 +79,7 @@ int main(int argc, char **argv) ppm_file->required = YES; ppm_file->multiple = NO; ppm_file->answer = NULL; - ppm_file->description = _("Name for new PPM file. (use '-' for stdout)"); + ppm_file->description = _("Name for new PPM file (use '-' for stdout)"); comment = G_define_flag(); comment->key = 'c'; @@ -128,7 +128,7 @@ int main(int argc, char **argv) else { fp = fopen(ppm_file->answer, "w"); if (!fp) - G_fatal_error(_("Unable to open file <%s>"), ppm_file->answer); + G_fatal_error(_("Unable to open file '%s'."), ppm_file->answer); } /* write header info */ diff --git a/raster/r.out.vrml/main.c b/raster/r.out.vrml/main.c index 0dbcb2c0518..11f397611bc 100644 --- a/raster/r.out.vrml/main.c +++ b/raster/r.out.vrml/main.c @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) if (is_fp) { if (Rast_read_fp_range(rast_el->answer, "", &fp_range) != 1) { G_fatal_error( - _("Range info for [%s] not available (run r.support)"), + _("Range info for <%s> not available (run r.support)."), rast_el->answer); } Rast_get_fp_range_min_max(&fp_range, &dmin, &dmax); @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) else { if (Rast_read_range(rast_el->answer, "", &range) == -1) { G_fatal_error( - _("Range info for <%s> not available (run r.support)"), + _("Range info for <%s> not available (run r.support)."), rast_el->answer); } Rast_get_range_min_max(&range, &cmin, &cmax); @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) /* open file for writing VRML */ G_message(_("Opening %s for writing... "), outfile); if (NULL == (vout = fopen(outfile, "w"))) { - G_fatal_error(_("Unable to open output file <%s>"), outfile); + G_fatal_error(_("Unable to open output file '%s'."), outfile); } } diff --git a/raster/r.path/main.c b/raster/r.path/main.c index ef8f9284933..4c530198909 100644 --- a/raster/r.path/main.c +++ b/raster/r.path/main.c @@ -255,7 +255,7 @@ int main(int argc, char **argv) pvout = NULL; if (opt.vect->answer) { if (0 > Vect_open_new(&vout, opt.vect->answer, 0)) { - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.vect->answer); } Vect_hist_command(&vout); @@ -315,7 +315,7 @@ int main(int argc, char **argv) Vect_set_open_level(1); /* topology not required */ if (1 > Vect_open_old(&In, opt.vpoint->answers[i], "")) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), opt.vpoint->answers[i]); G_verbose_message(_("Reading vector map <%s> with start points..."), diff --git a/raster/r.profile/main.c b/raster/r.profile/main.c index 0c5961fa383..7b5cf2d7c28 100644 --- a/raster/r.profile/main.c +++ b/raster/r.profile/main.c @@ -219,7 +219,7 @@ int main(int argc, char *argv[]) fp = stdout; } else if (NULL == (fp = fopen(outfile, "w"))) - G_fatal_error(_("Unable to open file <%s>"), outfile); + G_fatal_error(_("Unable to open file '%s'."), outfile); /* Get Raster Type */ data_type = Rast_get_map_type(fd); diff --git a/raster/r.proj/main.c b/raster/r.proj/main.c index d60759f5614..f7a198e5eb0 100644 --- a/raster/r.proj/main.c +++ b/raster/r.proj/main.c @@ -259,9 +259,9 @@ int main(int argc, char **argv) } if (gprint_bounds->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); outputFormat = SHELL; } diff --git a/raster/r.quant/read_rules.c b/raster/r.quant/read_rules.c index 76035247cd6..628bef28b88 100644 --- a/raster/r.quant/read_rules.c +++ b/raster/r.quant/read_rules.c @@ -82,7 +82,7 @@ int read_rules(const char *filename) else { fp = fopen(filename, "r"); if (!fp) - G_fatal_error(_("unable to open input file <%s>"), filename); + G_fatal_error(_("Unable to open input file '%s'."), filename); } read_range(); diff --git a/raster/r.quantile/main.c b/raster/r.quantile/main.c index 53f468fa244..9ed508bc3de 100644 --- a/raster/r.quantile/main.c +++ b/raster/r.quantile/main.c @@ -343,7 +343,7 @@ int main(int argc, char *argv[]) if (opt.file->answer != NULL && strcmp(opt.file->answer, "-") != 0) { if (NULL == freopen(opt.file->answer, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), + G_fatal_error(_("Unable to open file '%s' for writing."), opt.file->answer); } } diff --git a/raster/r.random/random.c b/raster/r.random/random.c index d1a2093115c..e419521458b 100644 --- a/raster/r.random/random.c +++ b/raster/r.random/random.c @@ -55,7 +55,7 @@ int execute_random(struct rr_state *theState) if (theState->outvector) { if (Vect_open_new(&Out, theState->outvector, theState->z_geometry) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), theState->outvector); Vect_hist_command(&Out); @@ -104,9 +104,9 @@ int execute_random(struct rr_state *theState) G_message(_("Writing raster map <%s> and vector map <%s> ..."), theState->outraster, theState->outvector); else if (theState->outraster) - G_message(_("Writing raster map <%s> ..."), theState->outraster); + G_message(_("Writing raster map <%s>..."), theState->outraster); else if (theState->outvector) - G_message(_("Writing vector map <%s> ..."), theState->outvector); + G_message(_("Writing vector map <%s>..."), theState->outvector); G_percent(0, theState->nRand, 2); @@ -181,7 +181,7 @@ int execute_random(struct rr_state *theState) db_set_string(&sql, buf); if (db_execute_immediate(driver, &sql) != DB_OK) - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); cat++; diff --git a/raster/r.random/support.c b/raster/r.random/support.c index 552b481ff57..62cae82cb15 100644 --- a/raster/r.random/support.c +++ b/raster/r.random/support.c @@ -63,7 +63,7 @@ int make_support(struct rr_state *theState, int percent, double percentage, struct Map_info map; if (Vect_open_old(&map, theState->outvector, G_mapset()) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), theState->outvector); Vect_hist_command(&map); Vect_close(&map); diff --git a/raster/r.reclass/main.c b/raster/r.reclass/main.c index b5de72ea5a3..856001ee469 100644 --- a/raster/r.reclass/main.c +++ b/raster/r.reclass/main.c @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) old_mapset = G_find_raster2(parm.input->answer, ""); if (old_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.input->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.input->answer); if (strcmp(parm.input->answer, parm.output->answer) == 0 && strcmp(old_mapset, G_mapset()) == 0) @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) if (tty) { fprintf( stderr, - _("Enter rule(s), \"end\" when done, \"help\" if you need it\n")); + _("Enter rules, \"end\" when done, \"help\" if you need it.\n")); if (map_type == FCELL_TYPE) fprintf(stderr, _("FCELL: Data range is %.7g to %.7g\n"), (double)min, (double)max); @@ -132,7 +132,7 @@ int main(int argc, char *argv[]) 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")); diff --git a/raster/r.recode/main.c b/raster/r.recode/main.c index 95cbad20ef1..0c9ba42a9ef 100644 --- a/raster/r.recode/main.c +++ b/raster/r.recode/main.c @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) if (strcmp(parm.rules->answer, "-") != 0) { srcfp = fopen(parm.rules->answer, "r"); if (!srcfp) - G_fatal_error(_("Unable to open file <%s>"), parm.rules->answer); + G_fatal_error(_("Unable to open file '%s'."), parm.rules->answer); } if (!read_rules(srcfp)) { diff --git a/raster/r.region/main.c b/raster/r.region/main.c index e4dc5ac934c..673b139b0d2 100644 --- a/raster/r.region/main.c +++ b/raster/r.region/main.c @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); if (Vect_open_old(&Map, name, "") != 1) - G_fatal_error(_("Unable to open vector map <%s>"), name); + G_fatal_error(_("Unable to open vector map <%s>."), name); Vect_get_map_box1(&Map, &box); window.north = box.N; diff --git a/raster/r.regression.line/main.c b/raster/r.regression.line/main.c index 445d7f33937..e1c3fe2c5d4 100644 --- a/raster/r.regression.line/main.c +++ b/raster/r.regression.line/main.c @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) name = output_opt->answer; if (name != NULL && strcmp(name, "-") != 0) { if (NULL == freopen(name, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), name); + G_fatal_error(_("Unable to open file '%s' for writing."), name); } } @@ -107,9 +107,9 @@ int main(int argc, char *argv[]) } if (shell_style->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON) { G_fatal_error(_("The -g flag cannot be used with format=json. " "Please select only one output format.")); diff --git a/raster/r.regression.multi/main.c b/raster/r.regression.multi/main.c index d41afd00f41..353cd763018 100644 --- a/raster/r.regression.multi/main.c +++ b/raster/r.regression.multi/main.c @@ -182,7 +182,7 @@ int main(int argc, char *argv[]) name = output_opt->answer; if (name != NULL && strcmp(name, "-") != 0) { if (NULL == freopen(name, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), name); + G_fatal_error(_("Unable to open file '%s' for writing."), name); } } @@ -206,9 +206,9 @@ int main(int argc, char *argv[]) } if (shell_style->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON) { G_fatal_error(_("The -g flag cannot be used with format=json. " "Please select only one output format.")); diff --git a/raster/r.report/parse.c b/raster/r.report/parse.c index 44e7bc5dbd3..3dfd2f8f5f4 100644 --- a/raster/r.report/parse.c +++ b/raster/r.report/parse.c @@ -273,7 +273,7 @@ int parse_layer(char *s) mapset = G_find_raster2(name, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), s); + G_fatal_error(_("Raster map <%s> not found."), s); n = nlayers++; layers = (LAYER *)G_realloc(layers, nlayers * sizeof(LAYER)); diff --git a/raster/r.resamp.bspline/main.c b/raster/r.resamp.bspline/main.c index 59a5dc0770e..c9f9b9491a7 100644 --- a/raster/r.resamp.bspline/main.c +++ b/raster/r.resamp.bspline/main.c @@ -212,8 +212,8 @@ int main(int argc, char *argv[]) G_verbose_message(_("spline step in ew direction %g"), stepE); G_verbose_message(_("spline step in ns direction %g"), stepN); - G_verbose_message(_("adjusted EW splines %d"), nsplx_adj); - G_verbose_message(_("adjusted NS splines %d"), nsply_adj); + G_verbose_message(_("Adjusted EW splines %d"), nsplx_adj); + G_verbose_message(_("Adjusted NS splines %d"), nsply_adj); /* calculate number of subregions */ edgeE = dims.ew_size - dims.overlap - 2 * dims.edge_v; @@ -478,7 +478,7 @@ int main(int argc, char *argv[]) if (grid_opt->answer) { if (0 > Vect_open_new(&Grid, grid_opt->answer, WITH_Z)) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), grid_opt->answer); Points = Vect_new_line_struct(); @@ -539,7 +539,7 @@ int main(int argc, char *argv[]) subregion_col++; subregion++; if (nsubregions > 1) - G_message(_("subregion %d of %d"), subregion, nsubregions); + G_message(_("Subregion %d of %d"), subregion, nsubregions); last_overlap_box.E = overlap_box.E; last_general_box.E = general_box.E; diff --git a/raster/r.resamp.filter/main.c b/raster/r.resamp.filter/main.c index 24043397364..985c535c338 100644 --- a/raster/r.resamp.filter/main.c +++ b/raster/r.resamp.filter/main.c @@ -674,7 +674,7 @@ int main(int argc, char *argv[]) struct Colors colors; if (Rast_read_colors(parm.rastin->answer, "", &colors) < 0) - G_fatal_error(_("Unable to read color table for %s"), + G_fatal_error(_("Unable to read color table for <%s>."), parm.rastin->answer); Rast_mark_colors_as_fp(&colors); Rast_write_colors(parm.rastout->answer, G_mapset(), &colors); diff --git a/raster/r.resamp.interp/main.c b/raster/r.resamp.interp/main.c index dd3905ea8e3..837966621f0 100644 --- a/raster/r.resamp.interp/main.c +++ b/raster/r.resamp.interp/main.c @@ -458,7 +458,8 @@ int main(int argc, char *argv[]) /* copy color table from source map */ if (Rast_read_colors(rastin->answer, "", &colors) < 0) - G_fatal_error(_("Unable to read color table for %s"), rastin->answer); + G_fatal_error(_("Unable to read color table for <%s>."), + rastin->answer); Rast_mark_colors_as_fp(&colors); Rast_write_colors(rastout->answer, G_mapset(), &colors); diff --git a/raster/r.resamp.rst/main.c b/raster/r.resamp.rst/main.c index cb1b6c13bdb..e75cbb4c00f 100644 --- a/raster/r.resamp.rst/main.c +++ b/raster/r.resamp.rst/main.c @@ -455,7 +455,7 @@ int main(int argc, char *argv[]) IL_check_at_points_2d, IL_secpar_loop_2d, IL_crst, IL_crstg, IL_write_temp_2d); - G_message(_("Temporarily changing the region to desired resolution ...")); + G_message(_("Temporarily changing the region to desired resolution...")); Rast_set_window(&outhd); bitmask = IL_create_bitmask(¶ms); diff --git a/raster/r.resamp.stats/main.c b/raster/r.resamp.stats/main.c index 24a46f7be9b..598ba68c75a 100644 --- a/raster/r.resamp.stats/main.c +++ b/raster/r.resamp.stats/main.c @@ -538,7 +538,7 @@ int main(int argc, char *argv[]) strcmp(parm.method->answer, "count") != 0 && strcmp(parm.method->answer, "diversity") != 0) { if (Rast_read_colors(parm.rastin->answer, "", &colors) < 0) - G_fatal_error(_("Unable to read color table for %s"), + G_fatal_error(_("Unable to read color table for <%s>."), parm.rastin->answer); Rast_mark_colors_as_fp(&colors); Rast_write_colors(parm.rastout->answer, G_mapset(), &colors); diff --git a/raster/r.rescale.eq/get_stats.c b/raster/r.rescale.eq/get_stats.c index d944092cbc9..86cfd8c7c77 100644 --- a/raster/r.rescale.eq/get_stats.c +++ b/raster/r.rescale.eq/get_stats.c @@ -16,7 +16,7 @@ int get_stats(const char *name, struct Cell_stats *statf) cell = Rast_allocate_c_buf(); Rast_init_cell_stats(statf); - G_message(_("Reading %s ..."), name); + G_message(_("Reading <%s>..."), name); for (row = 0; row < nrows; row++) { G_percent(row, nrows, 2); Rast_get_c_row(fd, cell, row); diff --git a/raster/r.rescale/get_range.c b/raster/r.rescale/get_range.c index c09b8ff6ec4..2856ec91353 100644 --- a/raster/r.rescale/get_range.c +++ b/raster/r.rescale/get_range.c @@ -21,7 +21,7 @@ int get_range(const char *name, long *min, long *max) fd = Rast_open_old(name, ""); nrows = Rast_window_rows(); ncols = Rast_window_cols(); - G_message(_("Reading %s ..."), name); + G_message(_("Reading <%s>..."), name); for (row = 0; row < nrows; row++) { G_percent(row, nrows, 2); Rast_get_c_row_nomask(fd, cell, row); diff --git a/raster/r.ros/main.c b/raster/r.ros/main.c index 1d8626c8e68..8ff3e36fcd8 100644 --- a/raster/r.ros/main.c +++ b/raster/r.ros/main.c @@ -356,7 +356,7 @@ int main(int argc, char *argv[]) /* Check if input layers exists in data base */ if (G_find_raster2(parm.model->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.model->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.model->answer); if (!(parm.mois_1h->answer || parm.mois_10h->answer || parm.mois_100h->answer)) { @@ -367,21 +367,22 @@ int main(int argc, char *argv[]) if (parm.mois_1h->answer) { if (G_find_raster2(parm.mois_1h->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.mois_1h->answer); + G_fatal_error(_("Raster map <%s> not found."), + parm.mois_1h->answer); } if (parm.mois_10h->answer) { if (G_find_raster2(parm.mois_10h->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), parm.mois_10h->answer); } if (parm.mois_100h->answer) { if (G_find_raster2(parm.mois_100h->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), parm.mois_100h->answer); } if (G_find_raster2(parm.mois_live->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.mois_live->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.mois_live->answer); if (parm.vel->answer && !(parm.dir->answer)) { G_fatal_error(_("A wind direction layer should be " @@ -395,11 +396,11 @@ int main(int argc, char *argv[]) } if (parm.vel->answer) { if (G_find_raster2(parm.vel->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.vel->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.vel->answer); } if (parm.dir->answer) { if (G_find_raster2(parm.dir->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.dir->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.dir->answer); } if (parm.slope->answer && !(parm.aspect->answer)) { @@ -414,11 +415,11 @@ int main(int argc, char *argv[]) } if (parm.slope->answer) { if (G_find_raster2(parm.slope->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.slope->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.slope->answer); } if (parm.aspect->answer) { if (G_find_raster2(parm.aspect->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.aspect->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.aspect->answer); } if (spotting) { @@ -428,7 +429,7 @@ int main(int argc, char *argv[]) } else { if (G_find_raster2(parm.elev->answer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), parm.elev->answer); } } diff --git a/raster/r.series.accumulate/main.c b/raster/r.series.accumulate/main.c index 9e32e057712..fab5b780ada 100644 --- a/raster/r.series.accumulate/main.c +++ b/raster/r.series.accumulate/main.c @@ -216,7 +216,7 @@ int main(int argc, char *argv[]) in = fopen(parm.file->answer, "r"); if (!in) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), parm.file->answer); num_inputs = 0; diff --git a/raster/r.series/main.c b/raster/r.series/main.c index b0e04102e2e..6e1e1e1f631 100644 --- a/raster/r.series/main.c +++ b/raster/r.series/main.c @@ -246,7 +246,7 @@ int main(int argc, char *argv[]) else { in = fopen(parm.file->answer, "r"); if (!in) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), parm.file->answer); } diff --git a/raster/r.sim/simlib/observation_points.c b/raster/r.sim/simlib/observation_points.c index 504df9a34e6..f152cadf9d7 100644 --- a/raster/r.sim/simlib/observation_points.c +++ b/raster/r.sim/simlib/observation_points.c @@ -39,7 +39,8 @@ void create_observation_points(ObservationPoints *points) Vect_set_open_level(1); if (Vect_open_old(&Map, points->observation, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), points->observation); + G_fatal_error(_("Unable to open vector map <%s>."), + points->observation); Vect_rewind(&Map); diff --git a/raster/r.sim/simlib/output.c b/raster/r.sim/simlib/output.c index d7f5986ef14..43045eba6dc 100644 --- a/raster/r.sim/simlib/output.c +++ b/raster/r.sim/simlib/output.c @@ -49,7 +49,7 @@ static void output_walker_as_vector(const char *name, int i; if (Vect_open_new(&Out, name, WITH_Z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), name); + G_fatal_error(_("Unable to create vector map <%s>."), name); G_message("Writing %i walker into vector file %s", sim->nstack, name); Points = Vect_new_line_struct(); @@ -395,7 +395,7 @@ int output_data(double tt, double name_time, double conn, const Setup *setup, Rast_add_f_color_rule(&dat1, 0, 0, 255, &dat2, 0, 0, 0, &colors); if ((mapst = G_find_file("cell", disch0, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), disch0); + G_fatal_error(_("Raster map <%s> not found."), disch0); Rast_write_colors(disch0, mapst, &colors); Rast_quantize_fp_map_range(disch0, mapst, 0., (FCELL)dismax, 0, (CELL)dismax); @@ -421,7 +421,7 @@ int output_data(double tt, double name_time, double conn, const Setup *setup, Rast_add_f_color_rule(&dat1, 191, 127, 63, &dat2, 0, 0, 0, &colors); if ((mapst = G_find_file("cell", flux0, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), flux0); + G_fatal_error(_("Raster map <%s> not found."), flux0); Rast_write_colors(flux0, mapst, &colors); Rast_quantize_fp_map_range(flux0, mapst, 0., (FCELL)dismax, 0, (CELL)dismax); @@ -461,7 +461,7 @@ int output_data(double tt, double name_time, double conn, const Setup *setup, Rast_add_f_color_rule(&dat1, 255, 0, 0, &dat2, 255, 0, 255, &colors); if ((mapst = G_find_file("cell", erdep0, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), erdep0); + G_fatal_error(_("Raster map <%s> not found."), erdep0); Rast_write_colors(erdep0, mapst, &colors); Rast_quantize_fp_map_range(erdep0, mapst, (FCELL)ermin, (FCELL)ermax, (CELL)ermin, (CELL)ermax); @@ -619,7 +619,7 @@ int output_et(const Geometry *geometry, const Outputs *outputs, /* if (ts == 1) { if ((mapst = G_find_file("cell", et0, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), et0); + G_fatal_error(_("Raster map <%s> not found."), et0); Rast_write_colors(et0, mapst, &colors); Rast_quantize_fp_map_range(et0, mapst, (FCELL)etmin, (FCELL)etmax, (CELL)etmin, (CELL)etmax); Rast_free_colors(&colors); @@ -627,7 +627,7 @@ int output_et(const Geometry *geometry, const Outputs *outputs, else { */ if ((mapst = G_find_file("cell", outputs->et, "")) == NULL) - G_fatal_error(_("Raster map <%s> not found"), outputs->et); + G_fatal_error(_("Raster map <%s> not found."), outputs->et); Rast_write_colors(outputs->et, mapst, &colors); Rast_quantize_fp_map_range(outputs->et, mapst, (FCELL)etmin, (FCELL)etmax, (CELL)etmin, (CELL)etmax); diff --git a/raster/r.smooth.edgepreserve/main.c b/raster/r.smooth.edgepreserve/main.c index 5ae804ebc5d..70d33b30896 100644 --- a/raster/r.smooth.edgepreserve/main.c +++ b/raster/r.smooth.edgepreserve/main.c @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) in_mapset = G_find_raster2(in_map, ""); if (in_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), in_map); + G_fatal_error(_("Raster map <%s> not found."), in_map); struct Cell_head window; Rast_get_window(&window); diff --git a/raster/r.spread/main.c b/raster/r.spread/main.c index 118d867fa6a..ce0c6685f22 100644 --- a/raster/r.spread/main.c +++ b/raster/r.spread/main.c @@ -439,23 +439,23 @@ int main(int argc, char *argv[]) G_fatal_error("Raster map <%s> not found", max_layer); if (G_find_raster2(dir_layer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), dir_layer); + G_fatal_error(_("Raster map <%s> not found."), dir_layer); if (G_find_raster2(base_layer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), base_layer); + G_fatal_error(_("Raster map <%s> not found."), base_layer); if (G_find_raster2(start_layer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), start_layer); + G_fatal_error(_("Raster map <%s> not found."), start_layer); if (spotting) { if (G_find_raster2(spotdist_layer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), spotdist_layer); + G_fatal_error(_("Raster map <%s> not found."), spotdist_layer); if (G_find_raster2(velocity_layer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), velocity_layer); + G_fatal_error(_("Raster map <%s> not found."), velocity_layer); if (G_find_raster2(mois_layer, "") == NULL) - G_fatal_error(_("Raster map <%s> not found"), mois_layer); + G_fatal_error(_("Raster map <%s> not found."), mois_layer); } /* Open input cell layers for reading */ @@ -554,7 +554,7 @@ int main(int argc, char *argv[]) heap = (struct costHa *)G_calloc(nrows * ncols + 1, sizeof(struct costHa)); heap_len = 0; - G_message(_("Reading %s..."), start_layer); + G_message(_("Reading <%s>..."), start_layer); G_debug(1, "Collecting origins..."); collect_ori(start_fd, start_is_time); G_debug(1, "Done"); diff --git a/raster/r.stats.quantile/main.c b/raster/r.stats.quantile/main.c index 9c1255863e5..631cbdabcfa 100644 --- a/raster/r.stats.quantile/main.c +++ b/raster/r.stats.quantile/main.c @@ -372,7 +372,7 @@ static void print_quantiles(char *fs, char *name, enum OutputFormat format) if (name != NULL && strcmp(name, "-") != 0) { if (NULL == freopen(name, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), name); + G_fatal_error(_("Unable to open file '%s' for writing."), name); } } @@ -745,9 +745,9 @@ int main(int argc, char *argv[]) } if (flag.t->answer) { - G_verbose_message( - _("Flag 't' is deprecated and will be removed in a future " - "release. Please use format=csv instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 't', "csv"); if (format == JSON) { G_fatal_error(_("The -t flag cannot be used with format=json. " "Please select only one output format.")); diff --git a/raster/r.stats/main.c b/raster/r.stats/main.c index c6df6e8c70d..b966716f6d4 100644 --- a/raster/r.stats/main.c +++ b/raster/r.stats/main.c @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) name = option.output->answer; if (name != NULL && strcmp(name, "-") != 0) { if (NULL == freopen(name, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), name); + G_fatal_error(_("Unable to open file '%s' for writing."), name); } } diff --git a/raster/r.stream.extract/bseg.c b/raster/r.stream.extract/bseg.c index 06945147787..680227665ce 100644 --- a/raster/r.stream.extract/bseg.c +++ b/raster/r.stream.extract/bseg.c @@ -38,7 +38,7 @@ int bseg_open(BSEG *bseg, int srows, int scols, int nsegs_in_memory) return -5; } else if (errflag == -6) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -6; } } diff --git a/raster/r.stream.extract/close.c b/raster/r.stream.extract/close.c index daccd699654..a7e3830e877 100644 --- a/raster/r.stream.extract/close.c +++ b/raster/r.stream.extract/close.c @@ -35,7 +35,7 @@ int close_streamvect(char *stream_vect) G_message(_("Writing vector map <%s>..."), stream_vect); if (Vect_open_new(&Out, stream_vect, 0) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), stream_vect); + G_fatal_error(_("Unable to create vector map <%s>."), stream_vect); nodestack = (struct sstack *)G_malloc(stack_step * sizeof(struct sstack)); network_id = G_malloc((n_stream_nodes + 1) * sizeof(int)); @@ -190,7 +190,8 @@ int close_streamvect(char *stream_vect) if (db_execute_immediate(driver, &dbsql) != DB_OK) { db_close_database(driver); db_shutdown_driver(driver); - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&dbsql)); + G_fatal_error(_("Unable to create table: '%s'."), + db_get_string(&dbsql)); } if (db_create_index2(driver, Fi->table, cat_col_name) != DB_OK) @@ -216,7 +217,7 @@ int close_streamvect(char *stream_vect) if (db_execute_immediate(driver, &dbsql) != DB_OK) { db_close_database(driver); db_shutdown_driver(driver); - G_fatal_error(_("Unable to insert new row: '%s'"), + G_fatal_error(_("Unable to insert new row: '%s'."), db_get_string(&dbsql)); } } diff --git a/raster/r.stream.extract/cseg.c b/raster/r.stream.extract/cseg.c index 9b3be28375f..1c19fcb0418 100644 --- a/raster/r.stream.extract/cseg.c +++ b/raster/r.stream.extract/cseg.c @@ -38,7 +38,7 @@ int cseg_open(CSEG *cseg, int srows, int scols, int nsegs_in_memory) return -5; } else if (errflag == -6) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -6; } } diff --git a/raster/r.stream.extract/dseg.c b/raster/r.stream.extract/dseg.c index ff439eea2f9..db7cba1c7c2 100644 --- a/raster/r.stream.extract/dseg.c +++ b/raster/r.stream.extract/dseg.c @@ -38,7 +38,7 @@ int dseg_open(DSEG *dseg, int srows, int scols, int nsegs_in_memory) return -5; } else if (errflag == -6) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -6; } } diff --git a/raster/r.stream.extract/main.c b/raster/r.stream.extract/main.c index 1675603a4de..267ab607d6e 100644 --- a/raster/r.stream.extract/main.c +++ b/raster/r.stream.extract/main.c @@ -163,16 +163,16 @@ int main(int argc, char *argv[]) /* input maps exist ? */ if (!G_find_raster2(input.ele->answer, "")) - G_fatal_error(_("Raster map <%s> not found"), input.ele->answer); + G_fatal_error(_("Raster map <%s> not found."), input.ele->answer); if (input.acc->answer) { if (!G_find_raster2(input.acc->answer, "")) - G_fatal_error(_("Raster map <%s> not found"), input.acc->answer); + G_fatal_error(_("Raster map <%s> not found."), input.acc->answer); } if (input.depression->answer) { if (!G_find_raster2(input.depression->answer, "")) - G_fatal_error(_("Raster map <%s> not found"), + G_fatal_error(_("Raster map <%s> not found."), input.depression->answer); have_depressions = 1; } diff --git a/raster/r.stream.extract/seg.c b/raster/r.stream.extract/seg.c index 414edc477be..63eacc0f857 100644 --- a/raster/r.stream.extract/seg.c +++ b/raster/r.stream.extract/seg.c @@ -38,7 +38,7 @@ int seg_open(SSEG *sseg, GW_LARGE_INT nrows, GW_LARGE_INT ncols, int row_in_seg, return -5; } else if (errflag == -6) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -6; } } diff --git a/raster/r.sun/main.c b/raster/r.sun/main.c index 0c032e0bc53..9b3fb412407 100644 --- a/raster/r.sun/main.c +++ b/raster/r.sun/main.c @@ -575,7 +575,7 @@ int main(int argc, char *argv[]) G_warning(_("Parallel processing disabled due to active mask.")); threads = 1; } - G_message(_("Number of threads <%d>"), threads); + G_message(_("Number of threads: %d"), threads); if (civiltime != NULL) { setUseCivilTime(TRUE); @@ -852,7 +852,7 @@ int INPUT_part(int offset, double *zmax) if (z == NULL) { if (!(z = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } @@ -862,7 +862,7 @@ int INPUT_part(int offset, double *zmax) cell3 = Rast_allocate_f_buf(); if (s == NULL) { if (!(s = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } fd3 = Rast_open_old(slopein, ""); @@ -873,7 +873,7 @@ int INPUT_part(int offset, double *zmax) if (o == NULL) { if (!(o = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } fd2 = Rast_open_old(aspin, ""); @@ -883,7 +883,7 @@ int INPUT_part(int offset, double *zmax) cell4 = Rast_allocate_f_buf(); if (li == NULL) { if (!(li = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } fd4 = Rast_open_old(linkein, ""); @@ -893,7 +893,7 @@ int INPUT_part(int offset, double *zmax) cell5 = Rast_allocate_f_buf(); if (a == NULL) { if (!(a = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } fd5 = Rast_open_old(albedo, ""); @@ -903,7 +903,7 @@ int INPUT_part(int offset, double *zmax) cell6 = Rast_allocate_f_buf(); if (latitudeArray == NULL) { if (!(latitudeArray = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } fd6 = Rast_open_old(latin, ""); @@ -913,7 +913,7 @@ int INPUT_part(int offset, double *zmax) cell7 = Rast_allocate_f_buf(); if (longitudeArray == NULL) { if (!(longitudeArray = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } @@ -924,7 +924,7 @@ int INPUT_part(int offset, double *zmax) rast1 = Rast_allocate_f_buf(); if (cbhr == NULL) { if (!(cbhr = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } fr1 = Rast_open_old(coefbh, ""); @@ -934,7 +934,7 @@ int INPUT_part(int offset, double *zmax) rast2 = Rast_allocate_f_buf(); if (cdhr == NULL) { if (!(cdhr = G_alloc_fmatrix(numRows, n))) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } } fr2 = Rast_open_old(coefdh, ""); diff --git a/raster/r.support/main.c b/raster/r.support/main.c index 707dff3287a..db8c691a1a3 100644 --- a/raster/r.support/main.c +++ b/raster/r.support/main.c @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) int i; if (!fp) - G_fatal_error(_("Unable to open output file <%s>"), + G_fatal_error(_("Unable to open output file '%s'."), save_opt->answer); Rast_read_history(raster->answer, "", &hist); @@ -203,7 +203,7 @@ int main(int argc, char *argv[]) FILE *fp = fopen(load_opt->answer, "r"); if (!fp) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), load_opt->answer); Rast_read_history(raster->answer, "", &hist); diff --git a/raster/r.terraflow/main.cpp b/raster/r.terraflow/main.cpp index 4aa1475190d..9a1fca1e68b 100644 --- a/raster/r.terraflow/main.cpp +++ b/raster/r.terraflow/main.cpp @@ -204,7 +204,7 @@ void check_header(char *cellname) const char *mapset; mapset = G_find_raster(cellname, ""); if (mapset == NULL) { - G_fatal_error(_("Raster map <%s> not found"), cellname); + G_fatal_error(_("Raster map <%s> not found."), cellname); } /* read cell header */ struct Cell_head cell_hd; @@ -351,7 +351,7 @@ void setFlowAccuColorTable(char *cellname) mapset = G_find_raster(cellname, ""); if (mapset == NULL) { - G_fatal_error(_("Raster map <%s> not found"), cellname); + G_fatal_error(_("Raster map <%s> not found."), cellname); } if (Rast_read_range(cellname, mapset, &r) == -1) { G_fatal_error(_("cannot read range")); @@ -387,7 +387,7 @@ void setSinkWatershedColorTable(char *cellname) mapset = G_find_raster(cellname, ""); if (mapset == NULL) { - G_fatal_error(_("Raster map <%s> not found"), cellname); + G_fatal_error(_("Raster map <%s> not found."), cellname); } if (Rast_read_range(cellname, mapset, &r) == -1) { G_fatal_error(_("cannot read range")); diff --git a/raster/r.tile/main.c b/raster/r.tile/main.c index bd9b5639907..860a443943b 100644 --- a/raster/r.tile/main.c +++ b/raster/r.tile/main.c @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) mapset = G_find_raster2(parm.rastin->answer, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), parm.rastin->answer); + G_fatal_error(_("Raster map <%s> not found."), parm.rastin->answer); /* set window to old map */ Rast_get_cellhd(parm.rastin->answer, "", &src_w); @@ -203,7 +203,7 @@ static void write_support_files(int xtile, int ytile, int overlap) /* copy color table from source map */ if (Rast_read_colors(parm.rastin->answer, "", &colors) < 0) - G_fatal_error(_("Unable to read color table for %s"), + G_fatal_error(_("Unable to read color table for <%s>."), parm.rastin->answer); if (map_type != CELL_TYPE) Rast_mark_colors_as_fp(&colors); diff --git a/raster/r.to.rast3/main.c b/raster/r.to.rast3/main.c index 63540e7c5d2..4bd1389b3e7 100644 --- a/raster/r.to.rast3/main.c +++ b/raster/r.to.rast3/main.c @@ -237,7 +237,7 @@ int main(int argc, char *argv[]) fd = (int *)G_malloc(region.depths * sizeof(int)); if (fd == NULL) - fatal_error(map, NULL, 0, _("Out of memory")); + fatal_error(map, NULL, 0, _("Out of memory.")); name = NULL; @@ -288,7 +288,7 @@ int main(int argc, char *argv[]) globalG3dMapType, maxSize); if (map == NULL) - fatal_error(map, fd, opencells, _("Error opening 3D raster map")); + fatal_error(map, fd, opencells, _("Error opening 3D raster map.")); /*if requested set the Mask on */ if (param.mask->answer) { @@ -323,7 +323,7 @@ int main(int argc, char *argv[]) Rast3d_fatal_error("Error flushing tiles with Rast3d_flush_all_tiles"); /* Close files and exit */ if (!Rast3d_close(map)) - Rast3d_fatal_error(_("Error closing 3d raster map")); + Rast3d_fatal_error(_("Error closing 3D raster map.")); map = NULL; diff --git a/raster/r.to.rast3elev/main.c b/raster/r.to.rast3elev/main.c index d6350bead3e..4d2a8984bdb 100644 --- a/raster/r.to.rast3elev/main.c +++ b/raster/r.to.rast3elev/main.c @@ -456,7 +456,7 @@ int main(int argc, char *argv[]) DCELL_TYPE, maxSize); if (db.map == NULL) - fatal_error(db, _("Error opening 3D raster map")); + fatal_error(db, _("Error opening 3D raster map.")); /*if requested set the Mask on */ if (param.mask->answer) { @@ -513,7 +513,7 @@ int main(int argc, char *argv[]) if (!Rast3d_flush_all_tiles(db.map)) Rast3d_fatal_error("Error flushing tiles with Rast3d_flush_all_tiles"); if (!Rast3d_close(db.map)) - Rast3d_fatal_error(_("Error closing 3d raster map")); + Rast3d_fatal_error(_("Error closing 3D raster map.")); G_debug(2, "\nDone\n"); diff --git a/raster/r.to.vect/main.c b/raster/r.to.vect/main.c index d9c3e117e80..4238a95e9d4 100644 --- a/raster/r.to.vect/main.c +++ b/raster/r.to.vect/main.c @@ -164,7 +164,7 @@ int main(int argc, char *argv[]) set_error_handler(&Map, &driver); if (Vect_open_new(&Map, out_opt->answer, z_flg->answer) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_hist_command(&Map); @@ -236,7 +236,8 @@ int main(int argc, char *argv[]) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) - G_fatal_error(_("Unable to create table: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), + db_get_string(&sql)); if (db_create_index2(driver, Fi->table, GV_KEY_COLUMN) != DB_OK) G_warning(_("Unable to create index")); diff --git a/raster/r.topmodel/file_io.c b/raster/r.topmodel/file_io.c index 1a901dc6a63..a0fc76b901d 100644 --- a/raster/r.topmodel/file_io.c +++ b/raster/r.topmodel/file_io.c @@ -25,7 +25,7 @@ void read_input(void) /* Read parameters file */ if ((fp = fopen(file.params, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), file.params); + G_fatal_error(_("Unable to open input file '%s'."), file.params); for (; !feof(fp);) { get_line(fp, buf); @@ -133,7 +133,7 @@ void read_input(void) /* Read topographic index statistics file */ if ((fp = fopen(file.topidxstats, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), file.topidxstats); + G_fatal_error(_("Unable to open input file '%s'."), file.topidxstats); topidxstats.atb = NULL; topidxstats.Aatb_r = NULL; @@ -158,7 +158,7 @@ void read_input(void) /* Read input file */ if ((fp = fopen(file.input, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), file.input); + G_fatal_error(_("Unable to open input file '%s'."), file.input); for (; !feof(fp);) { get_line(fp, buf); diff --git a/raster/r.univar/r.univar_main.c b/raster/r.univar/r.univar_main.c index 09c2e3e8bbc..00912e07b1f 100644 --- a/raster/r.univar/r.univar_main.c +++ b/raster/r.univar/r.univar_main.c @@ -94,8 +94,7 @@ void set_params(void) param.shell_style = G_define_flag(); param.shell_style->key = 'g'; - param.shell_style->label = - _("Print the stats in shell script style [deprecated]"); + param.shell_style->label = _("Print in shell script style [deprecated]"); param.shell_style->description = _( "This flag is deprecated and will be removed in a future release. Use " "format=shell instead."); @@ -187,7 +186,7 @@ int main(int argc, char *argv[]) name = param.output_file->answer; if (name != NULL && strcmp(name, "-") != 0) { if (NULL == freopen(name, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), name); + G_fatal_error(_("Unable to open file '%s' for writing."), name); } } @@ -213,9 +212,9 @@ int main(int argc, char *argv[]) } if (param.shell_style->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON || format == CSV) { G_fatal_error( _("The -g flag cannot be used with format=json or format=csv. " @@ -225,9 +224,9 @@ int main(int argc, char *argv[]) } if (param.table->answer) { - G_verbose_message( - _("Flag 't' is deprecated and will be removed in a future " - "release. Please use format=csv instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 't', "csv"); if (format == JSON || format == SHELL) { G_fatal_error(_( "The -t flag cannot be used with format=json or format=shell. " @@ -350,7 +349,7 @@ static int open_raster(const char *infile) mapset = G_find_raster2(infile, ""); if (mapset == NULL) { - G_fatal_error(_("Raster map <%s> not found"), infile); + G_fatal_error(_("Raster map <%s> not found."), infile); } fd = Rast_open_old(infile, mapset); diff --git a/raster/r.univar/r3.univar_main.c b/raster/r.univar/r3.univar_main.c index 4bae3358cce..ecfa696e397 100644 --- a/raster/r.univar/r3.univar_main.c +++ b/raster/r.univar/r3.univar_main.c @@ -56,8 +56,7 @@ void set_params(void) param.shell_style = G_define_flag(); param.shell_style->key = 'g'; - param.shell_style->label = - _("Print the stats in shell script style [deprecated]"); + param.shell_style->label = _("Print in shell script style [deprecated]"); param.shell_style->description = _( "This flag is deprecated and will be removed in a future release. Use " "format=shell instead."); @@ -143,7 +142,7 @@ int main(int argc, char *argv[]) name = param.output_file->answer; if (name != NULL && strcmp(name, "-") != 0) { if (NULL == freopen(name, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), name); + G_fatal_error(_("Unable to open file '%s' for writing."), name); } } @@ -169,9 +168,9 @@ int main(int argc, char *argv[]) } if (param.shell_style->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON || format == CSV) { G_fatal_error( _("The -g flag cannot be used with format=json or format=csv. " @@ -181,9 +180,9 @@ int main(int argc, char *argv[]) } if (param.table->answer) { - G_verbose_message( - _("Flag 't' is deprecated and will be removed in a future " - "release. Please use format=csv instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 't', "csv"); if (format == JSON || format == SHELL) { G_fatal_error(_( "The -t flag cannot be used with format=json or format=shell. " @@ -204,7 +203,7 @@ int main(int argc, char *argv[]) /* open 3D zoning raster with default region */ if ((zonemap = param.zonefile->answer) != NULL) { if (NULL == (mapset = G_find_raster3d(zonemap, ""))) - Rast3d_fatal_error(_("3D raster map <%s> not found"), zonemap); + Rast3d_fatal_error(_("3D raster map <%s> not found."), zonemap); zmap = Rast3d_open_cell_old(zonemap, G_find_raster3d(zonemap, ""), ®ion, RASTER3D_TILE_SAME_AS_FILE, @@ -242,7 +241,7 @@ int main(int argc, char *argv[]) infile = param.inputfile->answer; if (NULL == G_find_raster3d(infile, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), infile); + Rast3d_fatal_error(_("3D raster map <%s> not found."), infile); map = Rast3d_open_cell_old(infile, G_find_raster3d(infile, ""), ®ion, RASTER3D_TILE_SAME_AS_FILE, diff --git a/raster/r.viewshed/grass.cpp b/raster/r.viewshed/grass.cpp index 34aeb361b61..4ee9f4e123f 100644 --- a/raster/r.viewshed/grass.cpp +++ b/raster/r.viewshed/grass.cpp @@ -190,7 +190,7 @@ size_t init_event_list_in_memory(AEvent *eventList, char *rastName, mapset = G_find_raster(rastName, ""); if (mapset == NULL) - G_fatal_error(_("Raster map [%s] not found"), rastName); + G_fatal_error(_("Raster map <%s> not found."), rastName); /*open map */ int infd; @@ -416,7 +416,7 @@ AMI_STREAM *init_event_list(char *rastName, Viewpoint *vp, mapset = G_find_raster(rastName, ""); if (mapset == NULL) - G_fatal_error(_("Raster map [%s] not found"), rastName); + G_fatal_error(_("Raster map <%s> not found."), rastName); /*open map */ int infd; @@ -685,7 +685,7 @@ void save_vis_elev_to_GRASS(Grid *visgrid, char *elevfname, char *visfname, mapset = G_find_raster(elevfname, ""); if (mapset == NULL) - G_fatal_error(_("Raster map [%s] not found"), elevfname); + G_fatal_error(_("Raster map <%s> not found."), elevfname); /*open elevation map */ int elevfd; diff --git a/raster/r.volume/main.c b/raster/r.volume/main.c index 73243c7dd59..e24f44a1715 100644 --- a/raster/r.volume/main.c +++ b/raster/r.volume/main.c @@ -183,9 +183,9 @@ int main(int argc, char *argv[]) } if (flag.report->answer) { - G_verbose_message( - _("Flag 'f' is deprecated and will be removed in a future " - "release. Please use format=csv instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'f', "csv"); if (format == JSON) { G_fatal_error(_("The -f flag cannot be used with format=json. " "Please select only one output format.")); @@ -226,7 +226,7 @@ int main(int argc, char *argv[]) /* initialize vector map (for centroids) if needed */ if (centroidsmap) { if (Vect_open_new(fd_centroids, centroidsmap, WITHOUT_Z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), centroidsmap); + G_fatal_error(_("Unable to create vector map <%s>."), centroidsmap); Points = Vect_new_line_struct(); Cats = Vect_new_cats_struct(); @@ -336,7 +336,8 @@ int main(int argc, char *argv[]) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), + db_get_string(&sql)); } } diff --git a/raster/r.walk/flag.c b/raster/r.walk/flag.c index 3cfed9ec2ff..8d01acff64e 100644 --- a/raster/r.walk/flag.c +++ b/raster/r.walk/flag.c @@ -18,13 +18,13 @@ FLAG *flag_create(int nrows, int ncols) (unsigned char **)G_malloc(nrows * sizeof(unsigned char *)); if (!new_flag->array) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); temp = (unsigned char *)G_malloc((size_t)nrows * new_flag->leng * sizeof(unsigned char)); if (!temp) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); for (i = 0; i < nrows; i++) { new_flag->array[i] = temp; diff --git a/raster/r.walk/main.c b/raster/r.walk/main.c index 1f21ea1a900..5f3f837693d 100644 --- a/raster/r.walk/main.c +++ b/raster/r.walk/main.c @@ -461,7 +461,7 @@ int main(int argc, char *argv[]) if (dir && opt_solve->answer) { search_mapset = G_find_raster2(opt_solve->answer, ""); if (search_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), opt_solve->answer); + G_fatal_error(_("Raster map <%s> not found."), opt_solve->answer); have_solver = 1; } @@ -489,12 +489,12 @@ int main(int argc, char *argv[]) /* Open cost cell layer for reading */ dtm_mapset = G_find_raster2(dtm_layer, ""); if (dtm_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), dtm_layer); + G_fatal_error(_("Raster map <%s> not found."), dtm_layer); dtm_fd = Rast_open_old(dtm_layer, ""); cost_mapset = G_find_raster2(cost_layer, ""); if (cost_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), cost_layer); + G_fatal_error(_("Raster map <%s> not found."), cost_layer); cost_fd = Rast_open_old(cost_layer, cost_mapset); Rast_get_cellhd(dtm_layer, "", &dtm_cellhd); @@ -754,7 +754,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); /* topology not required */ if (1 > Vect_open_old(&In, opt7->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), opt7->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt7->answer); G_message(_("Reading vector map <%s> with start points..."), Vect_get_full_name(&In)); @@ -821,7 +821,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); /* topology not required */ if (1 > Vect_open_old(&In, opt8->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), opt8->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt8->answer); Vect_rewind(&In); @@ -866,7 +866,7 @@ int main(int argc, char *argv[]) search_mapset = G_find_raster(opt9->answer, ""); if (search_mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), opt9->answer); + G_fatal_error(_("Raster map <%s> not found."), opt9->answer); fd = Rast_open_old(opt9->answer, search_mapset); data_type2 = Rast_get_map_type(fd); @@ -1624,7 +1624,7 @@ int main(int argc, char *argv[]) nearest_size = Rast_cell_size(nearest_data_type); /* Copy segmented map to output map */ - G_message(_("Writing output raster map <%s>... "), cum_cost_layer); + G_message(_("Writing output raster map <%s>..."), cum_cost_layer); if (nearest_layer) { G_message(_("Writing raster map with nearest start point <%s>..."), nearest_layer); diff --git a/raster/r.water.outlet/main.c b/raster/r.water.outlet/main.c index dbd66af128c..711e41ef8d3 100644 --- a/raster/r.water.outlet/main.c +++ b/raster/r.water.outlet/main.c @@ -82,10 +82,10 @@ int main(int argc, char *argv[]) } if (!G_scan_easting(opt.coords->answers[0], &E, G_projection())) - G_fatal_error(_("Illegal east coordinate '%s'"), + G_fatal_error(_("Illegal east coordinate <%s>."), opt.coords->answers[0]); if (!G_scan_northing(opt.coords->answers[1], &N, G_projection())) - G_fatal_error(_("Illegal north coordinate '%s'"), + G_fatal_error(_("Illegal north coordinate <%s>."), opt.coords->answers[1]); G_debug(1, "easting = %.4f northing = %.4f", E, N); diff --git a/raster/r.watershed/seg/bseg_open.c b/raster/r.watershed/seg/bseg_open.c index bd8ddebcee6..8ad018de06c 100644 --- a/raster/r.watershed/seg/bseg_open.c +++ b/raster/r.watershed/seg/bseg_open.c @@ -40,7 +40,7 @@ int bseg_open(BSEG *bseg, int srows, int scols, int nsegs_in_memory) return -5; } else if (errflag == -6) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -6; } } diff --git a/raster/r.watershed/seg/cseg_open.c b/raster/r.watershed/seg/cseg_open.c index 334c34979d1..d04f53deba8 100644 --- a/raster/r.watershed/seg/cseg_open.c +++ b/raster/r.watershed/seg/cseg_open.c @@ -40,7 +40,7 @@ int cseg_open(CSEG *cseg, int srows, int scols, int nsegs_in_memory) ret = -5; } else if (errflag == -6) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); ret = -6; } G_free(filename); diff --git a/raster/r.watershed/seg/dseg_open.c b/raster/r.watershed/seg/dseg_open.c index 126361a2c2d..45741e69be0 100644 --- a/raster/r.watershed/seg/dseg_open.c +++ b/raster/r.watershed/seg/dseg_open.c @@ -40,7 +40,7 @@ int dseg_open(DSEG *dseg, int srows, int scols, int nsegs_in_memory) return -5; } else if (errflag == -6) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -6; } } diff --git a/raster/r.watershed/seg/sseg_open.c b/raster/r.watershed/seg/sseg_open.c index 4bb392b81f6..9ddc64c4675 100644 --- a/raster/r.watershed/seg/sseg_open.c +++ b/raster/r.watershed/seg/sseg_open.c @@ -39,7 +39,7 @@ int seg_open(SSEG *sseg, GW_LARGE_INT rows, GW_LARGE_INT cols, int row_in_seg, return -5; } else if (errflag == -6) { - G_warning(_("Out of memory")); + G_warning(_("Out of memory.")); return -6; } } diff --git a/raster/r.watershed/shed/main.c b/raster/r.watershed/shed/main.c index eead1290907..a9713e7e7d5 100644 --- a/raster/r.watershed/shed/main.c +++ b/raster/r.watershed/shed/main.c @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) free_input(&input); if ((output.out_file = fopen(output.file_name, "w")) == NULL) { free_output(&output); - G_fatal_error(_("unable to open output file")); + G_fatal_error(_("Unable to open output file.")); } if (output.do_basin) { fprintf(output.out_file, diff --git a/raster/r.what/main.c b/raster/r.what/main.c index 3806898dfae..6d428f75769 100644 --- a/raster/r.what/main.c +++ b/raster/r.what/main.c @@ -187,7 +187,7 @@ int main(int argc, char *argv[]) oname = opt.output->answer; if (oname != NULL && strcmp(oname, "-") != 0) { if (NULL == freopen(oname, "w", stdout)) { - G_fatal_error(_("Unable to open file <%s> for writing"), oname); + G_fatal_error(_("Unable to open file '%s' for writing."), oname); } } @@ -259,7 +259,7 @@ int main(int argc, char *argv[]) if (opt.points->answer) { Vect_set_open_level(1); /* topology not required */ if (Vect_open_old(&Map, opt.points->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), opt.points->answer); } Points = Vect_new_line_struct(); diff --git a/raster3d/r3.cross.rast/main.c b/raster3d/r3.cross.rast/main.c index c3ff036d0a0..4b379ff6834 100644 --- a/raster3d/r3.cross.rast/main.c +++ b/raster3d/r3.cross.rast/main.c @@ -49,7 +49,7 @@ void fatal_error(void *map, int elevfd, int outfd, char *errorMsg) if (map != NULL) { if (!Rast3d_close(map)) - Rast3d_fatal_error(_("Unable to close 3D raster map")); + Rast3d_fatal_error(_("Unable to close 3D raster map.")); } /*unopen the output map */ @@ -240,7 +240,7 @@ int main(int argc, char *argv[]) G_debug(3, "Open 3D raster map %s", param.input->answer); if (NULL == G_find_raster3d(param.input->answer, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), + Rast3d_fatal_error(_("3D raster map <%s> not found."), param.input->answer); /* Figure out the region from the map */ diff --git a/raster3d/r3.flow/flowline.c b/raster3d/r3.flow/flowline.c index 6a528d47ecc..ee2ea6dc298 100644 --- a/raster3d/r3.flow/flowline.c +++ b/raster3d/r3.flow/flowline.c @@ -55,7 +55,7 @@ static void write_segment_db(struct field_info *finfo, dbDriver *driver, db_append_string(sql, ")"); if (db_execute_immediate(driver, sql) != DB_OK) { - G_fatal_error(_("Unable to insert new record: '%s'"), + G_fatal_error(_("Unable to insert new record: '%s'."), db_get_string(sql)); } } diff --git a/raster3d/r3.flow/main.c b/raster3d/r3.flow/main.c index f50851bf595..11a56a9ff5b 100644 --- a/raster3d/r3.flow/main.c +++ b/raster3d/r3.flow/main.c @@ -59,7 +59,7 @@ static void create_table(struct Map_info *flowline_vec, db_begin_transaction(drvr); /* Create table */ if (db_execute_immediate(drvr, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(drvr, fi->table, fi->key) != DB_OK) G_warning(_("Unable to create index for table <%s>, key <%s>"), @@ -81,7 +81,7 @@ static void check_vector_input_maps(struct Option *vector_opt, for (i = 0; i < 3; i++) { if (vector_opt->answers[i] != NULL) { if (NULL == G_find_raster3d(vector_opt->answers[i], "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), + Rast3d_fatal_error(_("3D raster map <%s> not found."), vector_opt->answers[i]); } else { @@ -377,7 +377,7 @@ int main(int argc, char *argv[]) fl_cats = Vect_new_cats_struct(); fl_points = Vect_new_line_struct(); if (Vect_open_new(&fl_map, flowlines_opt->answer, TRUE) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), flowlines_opt->answer); Vect_hist_command(&fl_map); @@ -392,7 +392,7 @@ int main(int argc, char *argv[]) /* open vector map of seeds */ if (seed_opt->answer) { if (Vect_open_old2(&seed_Map, seed_opt->answer, "", "1") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), seed_opt->answer); if (!Vect_is_3d(&seed_Map)) G_fatal_error(_("Vector map <%s> is not 3D"), seed_opt->answer); diff --git a/raster3d/r3.in.ascii/main.c b/raster3d/r3.in.ascii/main.c index bc9ea073d2a..7287dbc4a7a 100644 --- a/raster3d/r3.in.ascii/main.c +++ b/raster3d/r3.in.ascii/main.c @@ -390,7 +390,7 @@ int main(int argc, char *argv[]) asciiToG3d(fp, ®ion, convertNull, nullValue); if (!Rast3d_close(map)) - fatalError(_("Unable to close 3D raster map")); + fatalError(_("Unable to close 3D raster map.")); /* write input name to map history */ Rast3d_read_history(output, G_mapset(), &history); diff --git a/raster3d/r3.in.bin/main.c b/raster3d/r3.in.bin/main.c index ecf31d3e611..2b2e4063f5f 100644 --- a/raster3d/r3.in.bin/main.c +++ b/raster3d/r3.in.bin/main.c @@ -431,11 +431,11 @@ int main(int argc, char *argv[]) region.bottom = atof(parm.bottom->answer); if (!G_scan_northing(parm.north->answer, ®ion.north, region.proj)) - G_fatal_error(_("Illegal north coordinate <%s>"), parm.north->answer); + G_fatal_error(_("Illegal north coordinate <%s>."), parm.north->answer); if (!G_scan_northing(parm.south->answer, ®ion.south, region.proj)) G_fatal_error(_("Illegal south coordinate <%s>"), parm.south->answer); if (!G_scan_easting(parm.east->answer, ®ion.east, region.proj)) - G_fatal_error(_("Illegal east coordinate <%s>"), parm.east->answer); + G_fatal_error(_("Illegal east coordinate <%s>."), parm.east->answer); if (!G_scan_easting(parm.west->answer, ®ion.west, region.proj)) G_fatal_error(_("Illegal west coordinate <%s>"), parm.west->answer); @@ -478,7 +478,7 @@ int main(int argc, char *argv[]) byte_swap, flag.row->answer, flag.depth->answer); if (!Rast3d_close(map)) - G_fatal_error(_("Unable to close 3D raster map")); + G_fatal_error(_("Unable to close 3D raster map.")); /* write input name to map history */ Rast3d_read_history(output, G_mapset(), &history); diff --git a/raster3d/r3.in.lidar/filters.c b/raster3d/r3.in.lidar/filters.c index b5b4ccca5eb..9a4ab4252c2 100644 --- a/raster3d/r3.in.lidar/filters.c +++ b/raster3d/r3.in.lidar/filters.c @@ -22,8 +22,8 @@ int range_filter_from_option(struct Option *option, double *min, double *max) { if (option->answer != NULL) { if (option->answers[0] == NULL || option->answers[1] == NULL) - G_fatal_error(_("Invalid range <%s> for option %s"), option->answer, - option->key); + G_fatal_error(_("Invalid range <%s> for option <%s>."), + option->answer, option->key); sscanf(option->answers[0], "%lf", min); sscanf(option->answers[1], "%lf", max); /* for convenience, switch order to make valid input */ diff --git a/raster3d/r3.in.lidar/main.c b/raster3d/r3.in.lidar/main.c index c66e56d1548..353d3f427d6 100644 --- a/raster3d/r3.in.lidar/main.c +++ b/raster3d/r3.in.lidar/main.c @@ -240,7 +240,7 @@ int main(int argc, char *argv[]) base_raster_opt = G_define_standard_option(G_OPT_R_INPUT); base_raster_opt->key = "base_raster"; base_raster_opt->required = NO; - base_raster_opt->label = _("Subtract raster values from the z coordinates"); + base_raster_opt->label = _("Subtract raster values from the Z coordinates"); base_raster_opt->description = _("The scale for z is applied beforehand, the filter afterwards"); base_raster_opt->guisection = _("Transform"); diff --git a/raster3d/r3.in.lidar/projection.c b/raster3d/r3.in.lidar/projection.c index c91a33461bf..2b021f0e260 100644 --- a/raster3d/r3.in.lidar/projection.c +++ b/raster3d/r3.in.lidar/projection.c @@ -132,8 +132,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, loc_proj_units, proj_info, proj_units, err); } else if (verbose) { - G_message(_( - "Coordinate reference system of input dataset and current project " - "appear to match")); + G_message(_("Coordinate reference system of input dataset and current " + "project appear to match.")); } } diff --git a/raster3d/r3.in.v5d/main.c b/raster3d/r3.in.v5d/main.c index f750892ff7e..1de159845fb 100644 --- a/raster3d/r3.in.v5d/main.c +++ b/raster3d/r3.in.v5d/main.c @@ -196,7 +196,7 @@ int main(int argc, char *argv[]) convert(input, ®ion, convertNull, nullValue); if (!Rast3d_close(map)) - fatalError(_("Unable to close 3D raster map")); + fatalError(_("Unable to close 3D raster map.")); map = NULL; return 0; diff --git a/raster3d/r3.info/main.c b/raster3d/r3.info/main.c index 44f326a4443..9e47ebea7e4 100644 --- a/raster3d/r3.info/main.c +++ b/raster3d/r3.info/main.c @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) mapset = G_find_raster3d(name, ""); if (mapset == NULL) - G_fatal_error(_("3D Raster map <%s> not found"), name); + G_fatal_error(_("3D raster map <%s> not found."), name); /*We need to open the map */ g3map = Rast3d_open_cell_old(name, mapset, RASTER3D_DEFAULT_WINDOW, diff --git a/raster3d/r3.mask/main.c b/raster3d/r3.mask/main.c index 83775a2d173..4b88c504023 100644 --- a/raster3d/r3.mask/main.c +++ b/raster3d/r3.mask/main.c @@ -47,7 +47,7 @@ static void makeMask(char *name, d_Mask *maskRules) cacheSize = Rast3d_cache_size_encode(RASTER3D_USE_CACHE_XY, 1); if (NULL == G_find_raster3d(name, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), name); + Rast3d_fatal_error(_("3D raster map <%s> not found."), name); map = Rast3d_open_cell_old(name, G_mapset(), RASTER3D_DEFAULT_WINDOW, DCELL_TYPE, cacheSize); diff --git a/raster3d/r3.neighbors/main.c b/raster3d/r3.neighbors/main.c index 4e0c632d7a6..236e091ce3f 100644 --- a/raster3d/r3.neighbors/main.c +++ b/raster3d/r3.neighbors/main.c @@ -219,7 +219,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); if (NULL == G_find_raster3d(param.input->answer, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), + Rast3d_fatal_error(_("3D raster map <%s> not found."), param.input->answer); Rast3d_init_defaults(); diff --git a/raster3d/r3.null/main.c b/raster3d/r3.null/main.c index ad322b8f214..80b330e51c7 100644 --- a/raster3d/r3.null/main.c +++ b/raster3d/r3.null/main.c @@ -87,7 +87,7 @@ static void modifyNull(char *name, d_Mask *maskRules, int changeNull, cacheSize = Rast3d_cache_size_encode(RASTER3D_USE_CACHE_XY, 1); if (NULL == G_find_raster3d(name, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), name); + Rast3d_fatal_error(_("3D raster map <%s> not found."), name); G_debug(1, "Changing NULLs of map %s in %s", name, G_mapset()); map = Rast3d_open_cell_old(name, G_mapset(), RASTER3D_DEFAULT_WINDOW, diff --git a/raster3d/r3.out.ascii/main.c b/raster3d/r3.out.ascii/main.c index 691b488b676..76d60d54fc0 100644 --- a/raster3d/r3.out.ascii/main.c +++ b/raster3d/r3.out.ascii/main.c @@ -54,7 +54,7 @@ void fatalError(char *errorMsg) /* should unopen map here! */ if (!Rast3d_close(map)) Rast3d_fatal_error("%s (%s)", errorMsg, - _("Unable to close 3D raster map")); + _("Unable to close 3D raster map.")); } Rast3d_fatal_error("%s", errorMsg); @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) } if (NULL == G_find_raster3d(input, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), input); + Rast3d_fatal_error(_("3D raster map <%s> not found."), input); /* Initiate the default settings */ Rast3d_init_defaults(); @@ -364,7 +364,7 @@ int main(int argc, char *argv[]) /* Close files and exit */ if (!Rast3d_close(map)) - fatalError(_("Unable to close 3D raster map")); + fatalError(_("Unable to close 3D raster map.")); if (output) if (fclose(fp)) diff --git a/raster3d/r3.out.bin/main.c b/raster3d/r3.out.bin/main.c index 99b8e825b50..1762c5d42a1 100644 --- a/raster3d/r3.out.bin/main.c +++ b/raster3d/r3.out.bin/main.c @@ -306,7 +306,7 @@ int main(int argc, char *argv[]) out_cell = G_malloc(bytes); if (NULL == G_find_raster3d(parm.input->answer, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), + Rast3d_fatal_error(_("3D raster map <%s> not found."), parm.input->answer); /* Initiate the default settings */ diff --git a/raster3d/r3.out.netcdf/main.c b/raster3d/r3.out.netcdf/main.c index c624cbce744..71348c3bbbe 100644 --- a/raster3d/r3.out.netcdf/main.c +++ b/raster3d/r3.out.netcdf/main.c @@ -568,7 +568,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); if (NULL == G_find_raster3d(param.input->answer, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), + Rast3d_fatal_error(_("3D raster map <%s> not found."), param.input->answer); /* Initiate the default settings */ @@ -615,7 +615,7 @@ int main(int argc, char *argv[]) /* Close files and exit */ if (!Rast3d_close(map)) - fatalError(_("Unable to close 3D raster map")); + fatalError(_("Unable to close 3D raster map.")); /* Close the netCDF file */ if ((retval = nc_close(ncid))) diff --git a/raster3d/r3.out.v5d/main.c b/raster3d/r3.out.v5d/main.c index 23d01b8fe7f..4be0f90b6dc 100644 --- a/raster3d/r3.out.v5d/main.c +++ b/raster3d/r3.out.v5d/main.c @@ -49,7 +49,7 @@ void fatalError(char *errorMsg) /* should unopen map here! */ if (!Rast3d_close(map)) Rast3d_fatal_error("%s (%s)", errorMsg, - _("Unable to close 3D raster map")); + _("Unable to close 3D raster map.")); } Rast3d_fatal_error("%s", errorMsg); @@ -304,7 +304,7 @@ int main(int argc, char *argv[]) trueCoords = coords->answer; if (NULL == G_find_raster3d(input, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), input); + Rast3d_fatal_error(_("3D raster map <%s> not found."), input); map = Rast3d_open_cell_old(input, G_find_raster3d(input, ""), RASTER3D_DEFAULT_WINDOW, @@ -324,7 +324,7 @@ int main(int argc, char *argv[]) /* Close files and exit */ if (!Rast3d_close(map)) - fatalError(_("Unable to close 3D raster map")); + fatalError(_("Unable to close 3D raster map.")); map = NULL; return (0); diff --git a/raster3d/r3.out.vtk/main.c b/raster3d/r3.out.vtk/main.c index b1bee6a129b..d3c5360faf4 100644 --- a/raster3d/r3.out.vtk/main.c +++ b/raster3d/r3.out.vtk/main.c @@ -132,7 +132,7 @@ void check_input_maps(void) if (param.input->answers != NULL) { for (i = 0; param.input->answers[i] != NULL; i++) { if (NULL == G_find_raster3d(param.input->answers[i], "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), + Rast3d_fatal_error(_("3D raster map <%s> not found."), param.input->answers[i]); } } @@ -245,7 +245,7 @@ void open_write_rgb_maps(input_maps *in, RASTER3D_Region region, FILE *fp, } /* Close the 3d raster map */ if (!Rast3d_close(maprgb)) { - fatal_error(_("Unable to close 3D raster map"), in); + fatal_error(_("Unable to close 3D raster map."), in); } /*Set the pointer to null so we know later that these files are @@ -330,7 +330,7 @@ void open_write_vector_maps(input_maps *in, RASTER3D_Region region, FILE *fp, /* Close the 3d raster map */ if (!Rast3d_close(mapvect)) { - fatal_error(_("Unable to close 3D raster map"), in); + fatal_error(_("Unable to close 3D raster map."), in); } /*Set the pointer to null so we know later that these files are * already closed */ @@ -385,7 +385,7 @@ int main(int argc, char *argv[]) /*The precision of the output */ if (param.decimals->answer) { if (sscanf(param.decimals->answer, "%d", &dp) != 1) - G_fatal_error(_("failed to interpret dp as an integer")); + G_fatal_error(_("Failed to interpret dp as an integer.")); if (dp > 20 || dp < 0) G_fatal_error(_("dp has to be from 0 to 20")); } @@ -416,7 +416,7 @@ int main(int argc, char *argv[]) fp = fopen(param.output->answer, "w"); if (fp == NULL) { perror(param.output->answer); - G_fatal_error(_("Unable to open file <%s>"), param.output->answer); + G_fatal_error(_("Unable to open file '%s'."), param.output->answer); } } else diff --git a/raster3d/r3.retile/main.c b/raster3d/r3.retile/main.c index be3ab20d83f..3fd08ec6a82 100644 --- a/raster3d/r3.retile/main.c +++ b/raster3d/r3.retile/main.c @@ -45,7 +45,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg) /* Close files and exit */ if (map != NULL) { if (!Rast3d_close(map)) - Rast3d_fatal_error(_("Unable to close the 3D raster map")); + Rast3d_fatal_error(_("Unable to close 3D raster map.")); } if (fd != NULL) { @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) mapset = G_find_raster3d(param.input->answer, ""); if (mapset == NULL) - Rast3d_fatal_error(_("3D raster map <%s> not found"), + Rast3d_fatal_error(_("3D raster map <%s> not found."), param.input->answer); /*Set the defaults */ @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) /* Close files and exit */ if (!Rast3d_close(map)) - fatal_error(map, NULL, 0, _("Error closing 3D raster map")); + fatal_error(map, NULL, 0, _("Error closing 3D raster map.")); map = NULL; diff --git a/raster3d/r3.stats/main.c b/raster3d/r3.stats/main.c index 85b2d5e588e..f8c7424b50d 100644 --- a/raster3d/r3.stats/main.c +++ b/raster3d/r3.stats/main.c @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) infile = inputfile->answer; if (NULL == G_find_raster3d(infile, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), infile); + Rast3d_fatal_error(_("3D raster map <%s> not found."), infile); map = Rast3d_open_cell_old(infile, G_find_raster3d(infile, ""), ®ion, RASTER3D_TILE_SAME_AS_FILE, diff --git a/raster3d/r3.support/main.c b/raster3d/r3.support/main.c index c0cd34b45ba..5d0410de3cc 100644 --- a/raster3d/r3.support/main.c +++ b/raster3d/r3.support/main.c @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) mapset = G_find_raster3d(infile, G_mapset()); /* current mapset only for editing */ if (!mapset || strcmp(mapset, G_mapset()) != 0) - G_fatal_error(_("3D raster map <%s> not found"), infile); + G_fatal_error(_("3D raster map <%s> not found."), infile); if (title_opt->answer) { strncpy(title, title_opt->answer, MAX_TITLE_LEN); @@ -148,7 +148,7 @@ int main(int argc, char *argv[]) int i; if (!fp) - G_fatal_error(_("Unable to open output file <%s>"), + G_fatal_error(_("Unable to open output file '%s'."), save_opt->answer); Rast3d_read_history(raster->answer, "", &hist); @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) FILE *fp = fopen(load_opt->answer, "r"); if (!fp) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), load_opt->answer); Rast3d_read_history(raster->answer, "", &hist); diff --git a/raster3d/r3.timestamp/main.c b/raster3d/r3.timestamp/main.c index 4d90a98f81c..cb151f41638 100644 --- a/raster3d/r3.timestamp/main.c +++ b/raster3d/r3.timestamp/main.c @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) mapset = G_find_raster3d(name, ""); if (mapset == NULL) { - G_fatal_error(_("3D raster map <%s> not found"), name); + G_fatal_error(_("3D raster map <%s> not found."), name); exit(EXIT_FAILURE); } diff --git a/raster3d/r3.to.rast/main.c b/raster3d/r3.to.rast/main.c index 60bc9212fb0..5959688f7ac 100644 --- a/raster3d/r3.to.rast/main.c +++ b/raster3d/r3.to.rast/main.c @@ -69,7 +69,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg) /* Close files and exit */ if (map != NULL) { if (!Rast3d_close(map)) - Rast3d_fatal_error(_("Unable to close 3D raster map")); + Rast3d_fatal_error(_("Unable to close 3D raster map.")); } if (fd != NULL) { @@ -267,7 +267,7 @@ int main(int argc, char *argv[]) G_debug(3, "Open 3D raster map <%s>", param.input->answer); if (NULL == G_find_raster3d(param.input->answer, "")) - Rast3d_fatal_error(_("3D raster map <%s> not found"), + Rast3d_fatal_error(_("3D raster map <%s> not found."), param.input->answer); /* coefficients to modify the map */ @@ -351,7 +351,7 @@ int main(int argc, char *argv[]) fd = (int *)G_malloc(region.depths * sizeof(int)); if (fd == NULL) - fatal_error(map, NULL, 0, _("Out of memory")); + fatal_error(map, NULL, 0, _("Out of memory.")); G_message(_("Creating %i raster maps"), region.depths); @@ -436,7 +436,7 @@ int main(int argc, char *argv[]) /* Close files and exit */ if (!Rast3d_close(map)) - fatal_error(map, NULL, 0, _("Unable to close 3D raster map")); + fatal_error(map, NULL, 0, _("Unable to close 3D raster map.")); map = NULL; diff --git a/scripts/d.correlate/d.correlate.py b/scripts/d.correlate/d.correlate.py index cd720cbfa41..50f24c6d7ed 100755 --- a/scripts/d.correlate/d.correlate.py +++ b/scripts/d.correlate/d.correlate.py @@ -40,7 +40,7 @@ def main(): for map in layers: if not gcore.find_file(map, element="cell")["file"]: - gcore.fatal(_("Raster map <%s> not found") % map) + gcore.fatal(_("Raster map <%s> not found.") % map) try: gcore.write_command( diff --git a/scripts/d.polar/d.polar.py b/scripts/d.polar/d.polar.py index a2129837c80..a854ca3ee84 100755 --- a/scripts/d.polar/d.polar.py +++ b/scripts/d.polar/d.polar.py @@ -52,7 +52,7 @@ def raster_map_required(name): if not gcore.find_file(name, "cell")["file"]: - gcore.fatal(_("Raster map <%s> not found") % name) + gcore.fatal(_("Raster map <%s> not found.") % name) def cleanup(): diff --git a/scripts/d.rast.leg/d.rast.leg.py b/scripts/d.rast.leg/d.rast.leg.py index 4e4c0c60ede..972d0f89b43 100755 --- a/scripts/d.rast.leg/d.rast.leg.py +++ b/scripts/d.rast.leg/d.rast.leg.py @@ -89,11 +89,11 @@ def main(): # for -n flag of d.legend if not gs.find_file(map)["file"]: - gs.fatal(_("Raster map <%s> not found") % map) + gs.fatal(_("Raster map <%s> not found.") % map) # for rast= if rast and not gs.find_file(rast)["file"]: - gs.fatal(_("Raster map <%s> not found") % rast) + gs.fatal(_("Raster map <%s> not found.") % rast) s = gs.read_command("d.info", flags="f") if not s: diff --git a/scripts/d.what.rast/d.what.rast.py b/scripts/d.what.rast/d.what.rast.py index 591c7d698fb..695e659af91 100644 --- a/scripts/d.what.rast/d.what.rast.py +++ b/scripts/d.what.rast/d.what.rast.py @@ -29,7 +29,7 @@ def main(): if "MONITOR" in gisenv: cmd_file = gcore.parse_command("d.mon", flags="g").get("cmd", None) if not cmd_file: - gcore.fatal(_("Unable to open file '%s'") % cmd_file) + gcore.fatal(_("Unable to open file '%s'.") % cmd_file) dout_cmd = "d.what.rast" for param, val in options.items(): if val: diff --git a/scripts/d.what.vect/d.what.vect.py b/scripts/d.what.vect/d.what.vect.py index 7e413228875..4edc6a61d9b 100644 --- a/scripts/d.what.vect/d.what.vect.py +++ b/scripts/d.what.vect/d.what.vect.py @@ -29,7 +29,7 @@ def main(): if "MONITOR" in gisenv: cmd_file = gcore.parse_command("d.mon", flags="g").get("cmd", None) if not cmd_file: - gcore.fatal(_("Unable to open file '%s'") % cmd_file) + gcore.fatal(_("Unable to open file '%s'.") % cmd_file) dout_cmd = "d.what.vect" for param, val in options.items(): if val: diff --git a/scripts/db.in.ogr/db.in.ogr.py b/scripts/db.in.ogr/db.in.ogr.py index 63f324dda40..31c1757888f 100755 --- a/scripts/db.in.ogr/db.in.ogr.py +++ b/scripts/db.in.ogr/db.in.ogr.py @@ -112,7 +112,7 @@ def main(): "db.execute", input="-", stdin="DROP TABLE %s" % output ) break - gs.fatal(_("Table <%s> already exists") % output) + gs.fatal(_("Table <%s> already exists.") % output) # treat DB as real vector map... layer = db_table or None diff --git a/scripts/db.out.ogr/db.out.ogr.py b/scripts/db.out.ogr/db.out.ogr.py index d67186e6a49..50d18dd9945 100755 --- a/scripts/db.out.ogr/db.out.ogr.py +++ b/scripts/db.out.ogr/db.out.ogr.py @@ -75,7 +75,7 @@ def main(): # is there a simpler way of testing for --overwrite? dbffile = input + ".dbf" if Path(dbffile).exists() and not gcore.overwrite(): - gcore.fatal(_("File <%s> already exists") % dbffile) + gcore.fatal(_("File '%s' already exists.") % dbffile) if olayer: try: diff --git a/scripts/db.univar/db.univar.py b/scripts/db.univar/db.univar.py index b0eaf600163..c26f2700041 100755 --- a/scripts/db.univar/db.univar.py +++ b/scripts/db.univar/db.univar.py @@ -53,7 +53,7 @@ # %end # %flag # % key: g -# % label: Print stats in shell script style [deprecated] +# % label: Print in shell script style [deprecated] # % description: This flag is deprecated and will be removed in a future release. Use format=shell instead. # %end diff --git a/scripts/i.tasscap/i.tasscap.py b/scripts/i.tasscap/i.tasscap.py index 40ef71fe8c9..3eb7c4a0971 100755 --- a/scripts/i.tasscap/i.tasscap.py +++ b/scripts/i.tasscap/i.tasscap.py @@ -67,7 +67,7 @@ # %end # %option G_OPT_R_BASENAME_OUTPUT -# % label: basename for output raster map(s) +# % label: Basename for output raster maps # %end # %option diff --git a/scripts/r.buffer.lowmem/r.buffer.lowmem.py b/scripts/r.buffer.lowmem/r.buffer.lowmem.py index 44814c37c9b..b4dac2d7190 100755 --- a/scripts/r.buffer.lowmem/r.buffer.lowmem.py +++ b/scripts/r.buffer.lowmem/r.buffer.lowmem.py @@ -80,7 +80,7 @@ def main(): # check if input file exists if not gs.find_file(input)["file"]: - gs.fatal(_("Raster map <%s> not found") % input) + gs.fatal(_("Raster map <%s> not found.") % input) scale = scales[units] diff --git a/scripts/r.fillnulls/r.fillnulls.py b/scripts/r.fillnulls/r.fillnulls.py index 9de30e19947..3a7aac7a576 100755 --- a/scripts/r.fillnulls/r.fillnulls.py +++ b/scripts/r.fillnulls/r.fillnulls.py @@ -146,7 +146,7 @@ def main(): # check if input file exists if not gs.find_file(input)["file"]: - gs.fatal(_("Raster map <%s> not found") % input) + gs.fatal(_("Raster map <%s> not found.") % input) # save original region reg_org = gs.region() diff --git a/scripts/r.grow/r.grow.py b/scripts/r.grow/r.grow.py index dd1702cc775..ef531045a83 100755 --- a/scripts/r.grow/r.grow.py +++ b/scripts/r.grow/r.grow.py @@ -119,7 +119,7 @@ def main(): # check if input file exists if not gs.find_file(input)["file"]: - gs.fatal(_("Raster map <%s> not found") % input) + gs.fatal(_("Raster map <%s> not found.") % input) # Workaround for r.mapcalc bug #3475 # Mapcalc will fail if output is a fully qualified map name diff --git a/scripts/r.in.wms/wms_base.py b/scripts/r.in.wms/wms_base.py index 151bcbdbbab..b03f77d5520 100644 --- a/scripts/r.in.wms/wms_base.py +++ b/scripts/r.in.wms/wms_base.py @@ -493,7 +493,7 @@ def _tempfile(self): """ temp_file = gs.tempfile() if temp_file is None: - gs.fatal(_("Unable to create temporary files")) + gs.fatal(_("Unable to create temporary files.")) # list of created tempfiles for destructor self.temp_files_to_cleanup.append(temp_file) diff --git a/scripts/r.mask/r.mask.py b/scripts/r.mask/r.mask.py index 6328e8f6686..0892bf87b4e 100755 --- a/scripts/r.mask/r.mask.py +++ b/scripts/r.mask/r.mask.py @@ -145,7 +145,7 @@ def main(): if raster: # check if input raster exists if not gs.find_file(raster)["file"]: - gs.fatal(_("Raster map <%s> not found") % raster) + gs.fatal(_("Raster map <%s> not found.") % raster) if maskcats != "*" and not remove: if gs.raster_info(raster)["datatype"] != "CELL": diff --git a/scripts/r.pack/r.pack.py b/scripts/r.pack/r.pack.py index 1ca877dcc97..33970a50a77 100644 --- a/scripts/r.pack/r.pack.py +++ b/scripts/r.pack/r.pack.py @@ -68,7 +68,7 @@ def main(): gfile = grass.find_file(name=infile, element="cell", mapset=mapset) if not gfile["name"]: - grass.fatal(_("Raster map <%s> not found") % infile) + grass.fatal(_("Raster map <%s> not found.") % infile) parent_dir = Path(outfile).parent if os.path.exists(outfile): # noqa: PTH110 # Problem with tests, the way a permission error occurs when checking diff --git a/scripts/r.reclass.area/r.reclass.area.py b/scripts/r.reclass.area/r.reclass.area.py index 5ba65d34572..e4e88bcec06 100755 --- a/scripts/r.reclass.area/r.reclass.area.py +++ b/scripts/r.reclass.area/r.reclass.area.py @@ -369,7 +369,7 @@ def rmarea( def main() -> None: """Run area filtering.""" if not gs.find_file(options["input"])["name"]: - gs.fatal(_("Raster map <%s> not found") % options["input"]) + gs.fatal(_("Raster map <%s> not found.") % options["input"]) # Check for unsupported locations resolution = check_projection() diff --git a/scripts/r.rgb/r.rgb.py b/scripts/r.rgb/r.rgb.py index 7beaa370275..9270dec9473 100755 --- a/scripts/r.rgb/r.rgb.py +++ b/scripts/r.rgb/r.rgb.py @@ -50,7 +50,7 @@ def main(): blue = options["blue"] if not gs.find_file(input)["file"]: - gs.fatal(_("Raster map <%s> not found") % input) + gs.fatal(_("Raster map <%s> not found.") % input) expressions = [] maps = [] diff --git a/scripts/r.unpack/r.unpack.py b/scripts/r.unpack/r.unpack.py index a44d7be3b7f..0100d057ff1 100644 --- a/scripts/r.unpack/r.unpack.py +++ b/scripts/r.unpack/r.unpack.py @@ -28,7 +28,7 @@ # %flag # % key: o # % label: Override projection check (use current projects's CRS) -# % description: Assume that the dataset has same coordinate reference system as the current project +# % description: Assume that the dataset has the same coordinate reference system as the current project # % guisection: Output settings # %end # %flag diff --git a/scripts/r3.in.xyz/r3.in.xyz.py b/scripts/r3.in.xyz/r3.in.xyz.py index 3ebd58ec48d..d8d0b50c180 100755 --- a/scripts/r3.in.xyz/r3.in.xyz.py +++ b/scripts/r3.in.xyz/r3.in.xyz.py @@ -140,7 +140,7 @@ # % required: no # % multiple: no # % options: 1-100 -# % description: pth percentile of the values +# % description: Pth percentile of the values # % guisection: Statistic # %End # %Option diff --git a/scripts/v.db.addtable/v.db.addtable.py b/scripts/v.db.addtable/v.db.addtable.py index 242cf7c3dde..2d791379ae7 100755 --- a/scripts/v.db.addtable/v.db.addtable.py +++ b/scripts/v.db.addtable/v.db.addtable.py @@ -133,7 +133,7 @@ def main(): try: gs.run_command("db.execute", database=database2, driver=driver, sql=sql) except CalledModuleError: - gs.fatal(_("Unable to create table <%s>") % table) + gs.fatal(_("Unable to create table <%s>.") % table) # connect the map to the DB: if schema: diff --git a/scripts/v.db.droptable/v.db.droptable.py b/scripts/v.db.droptable/v.db.droptable.py index c9c8a0f1049..3ee1e11ce9b 100755 --- a/scripts/v.db.droptable/v.db.droptable.py +++ b/scripts/v.db.droptable/v.db.droptable.py @@ -104,7 +104,7 @@ def main(): gs.run_command("v.db.connect", flags="d", map=map, layer=layer) - gs.message(_("Current attribute table link(s):")) + gs.message(_("Current attribute table links:")) # silently test first to avoid confusing error messages nuldev = open(os.devnull, "w") try: diff --git a/scripts/v.db.univar/v.db.univar.py b/scripts/v.db.univar/v.db.univar.py index 4bad9363bba..44629e9c63f 100755 --- a/scripts/v.db.univar/v.db.univar.py +++ b/scripts/v.db.univar/v.db.univar.py @@ -49,7 +49,7 @@ # %end # %flag # % key: g -# % label: Print stats in shell script style [deprecated] +# % label: Print in shell script style [deprecated] # % description: This flag is deprecated and will be removed in a future release. Use format=shell instead. # %end diff --git a/scripts/v.db.update/v.db.update.py b/scripts/v.db.update/v.db.update.py index 7e29265e367..49975c2efd9 100755 --- a/scripts/v.db.update/v.db.update.py +++ b/scripts/v.db.update/v.db.update.py @@ -87,7 +87,7 @@ def main(): gs.fatal(_("Use of libsqlitefunctions only with SQLite backend")) if driver == "sqlite" and sqlitefile: if not os.access(sqlitefile, os.R_OK): - gs.fatal(_("File <%s> not found") % sqlitefile) + gs.fatal(_("File '%s' not found.") % sqlitefile) # Check column existence and get its type. all_columns = gs.vector_columns(vector, layer) @@ -97,7 +97,7 @@ def main(): coltype = column_record["type"] break if not coltype: - gs.fatal(_("Column <%s> not found") % column) + gs.fatal(_("Column <%s> not found.") % column) if qcolumn: if value: diff --git a/scripts/v.dissolve/v.dissolve.py b/scripts/v.dissolve/v.dissolve.py index 33650fe5619..c317119b7de 100755 --- a/scripts/v.dissolve/v.dissolve.py +++ b/scripts/v.dissolve/v.dissolve.py @@ -25,7 +25,7 @@ # % guisection: Dissolving # %end # %option G_OPT_V_FIELD -# % label: Layer number or name. +# % label: Layer number or name # % required: no # % guisection: Dissolving # %end @@ -603,7 +603,7 @@ def main(): try: coltype = gs.vector_columns(input_vector, layer)[column] except KeyError: - gs.fatal(_("Column <%s> not found") % column) + gs.fatal(_("Column <%s> not found.") % column) if coltype["type"] not in {"INTEGER", "SMALLINT", "CHARACTER", "TEXT"}: gs.fatal(_("Key column must be of type integer or string")) diff --git a/scripts/v.in.geonames/v.in.geonames.py b/scripts/v.in.geonames/v.in.geonames.py index 36a65db4467..b63f0769b0c 100755 --- a/scripts/v.in.geonames/v.in.geonames.py +++ b/scripts/v.in.geonames/v.in.geonames.py @@ -49,7 +49,7 @@ def main(): # input test if not os.access(infile, os.R_OK): - gs.fatal(_("File <%s> not found") % infile) + gs.fatal(_("File '%s' not found.") % infile) # DBF doesn't support lengthy text fields kv = gs.db_connection() diff --git a/scripts/v.rast.stats/v.rast.stats.py b/scripts/v.rast.stats/v.rast.stats.py index 467d299cfa2..7d55c43f1c8 100644 --- a/scripts/v.rast.stats/v.rast.stats.py +++ b/scripts/v.rast.stats/v.rast.stats.py @@ -148,7 +148,7 @@ def main(): for raster in rasters: # check the input raster map if not gs.find_file(raster, "cell")["file"]: - gs.fatal(_("Raster map <%s> not found") % raster) + gs.fatal(_("Raster map <%s> not found.") % raster) # save current settings: gs.use_temp_region() diff --git a/scripts/v.unpack/v.unpack.py b/scripts/v.unpack/v.unpack.py index bd3644c1d93..d7fae0d69c8 100644 --- a/scripts/v.unpack/v.unpack.py +++ b/scripts/v.unpack/v.unpack.py @@ -30,7 +30,7 @@ # %flag # % key: o # % label: Override projection check (use current projects's CRS) -# % description: Assume that the dataset has same coordinate reference system as the current project +# % description: Assume that the dataset has the same coordinate reference system as the current project # % guisection: Output settings # %end # %flag @@ -66,7 +66,7 @@ def main(): # check if the input file exists if not Path(infile).exists(): - grass.fatal(_("File <%s> not found") % infile) + grass.fatal(_("File '%s' not found.") % infile) # copy the files to tmp dir input_base = os.path.basename(infile) @@ -104,7 +104,7 @@ def main(): gfile = grass.find_file(name=map_name, element="vector", mapset=".") overwrite = os.getenv("GRASS_OVERWRITE") if gfile["file"] and overwrite != "1": - grass.fatal(_("Vector map <%s> already exists") % map_name) + grass.fatal(_("Vector map <%s> already exists.") % map_name) elif overwrite == "1" and gfile["file"]: grass.warning( _("Vector map <%s> already exists and will be overwritten") % map_name @@ -264,7 +264,7 @@ def main(): ) except CalledModuleError: grass.fatal( - _("Unable to connect table <%s> to vector map <%s>") + _("Unable to connect table <%s> to vector map <%s>.") % (to_table, map_name) ) diff --git a/scripts/v.what.strds/v.what.strds.py b/scripts/v.what.strds/v.what.strds.py index 4ee50a82802..cdc37d71635 100644 --- a/scripts/v.what.strds/v.what.strds.py +++ b/scripts/v.what.strds/v.what.strds.py @@ -223,7 +223,7 @@ def main(): pymap.open("r") except Exception: dbif.close() - gs.fatal(_("Unable to create vector map <%s>") % output) + gs.fatal(_("Unable to create vector map <%s>.") % output) if len(pymap.dblinks) == 0: try: diff --git a/temporal/t.connect/main.c b/temporal/t.connect/main.c index e0242195ee1..95055bde047 100644 --- a/temporal/t.connect/main.c +++ b/temporal/t.connect/main.c @@ -140,9 +140,9 @@ int main(int argc, char *argv[]) } if (sh->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON) { /* Free memory before failing to prevent memory leaks */ if (root_value) diff --git a/temporal/t.vect.import/t.vect.import.py b/temporal/t.vect.import/t.vect.import.py index 20010b3191b..1c119520b7e 100755 --- a/temporal/t.vect.import/t.vect.import.py +++ b/temporal/t.vect.import/t.vect.import.py @@ -72,7 +72,7 @@ # %flag # % key: o # % label: Override projection check (use current projects's CRS) -# % description: Assume that the dataset has same coordinate reference system as the current project +# % description: Assume that the dataset has the same coordinate reference system as the current project # %end # %flag diff --git a/vector/v.buffer/main.c b/vector/v.buffer/main.c index 56fe3792472..57ae9f69640 100644 --- a/vector/v.buffer/main.c +++ b/vector/v.buffer/main.c @@ -326,7 +326,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); /* topology required */ if (Vect_open_old2(&In, in_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); Vect_set_error_handler_io(&In, &Out); @@ -395,7 +395,7 @@ int main(int argc, char *argv[]) } if (Vect_open_new(&Out, out_opt->answer, WITHOUT_Z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Points = Vect_new_line_struct(); Cats = Vect_new_cats_struct(); @@ -416,7 +416,7 @@ int main(int argc, char *argv[]) Fi = Vect_get_field(&In, field); if (Fi == 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_open_database(Fi->driver, Fi->database); @@ -546,7 +546,7 @@ int main(int argc, char *argv[]) if (size_val < 0.0) { G_warning(_("Attribute is of invalid size (%.3f) for " - "category %d"), + "category %d."), size_val, cat); continue; } @@ -659,7 +659,7 @@ int main(int argc, char *argv[]) if (size_val < 0.0) { G_warning(_("Attribute is of invalid size (%.3f) for " - "category %d"), + "category %d."), size_val, cat); continue; } @@ -804,7 +804,7 @@ int main(int argc, char *argv[]) G_message(_("Removing duplicates...")); Vect_remove_duplicates(&Out, GV_BOUNDARY, NULL); - G_message(_("Cleaning boundaries at nodes")); + G_message(_("Cleaning boundaries at nodes...")); } while (Vect_clean_small_angles_at_nodes(&Out, GV_BOUNDARY, NULL) > 0); diff --git a/vector/v.build.polylines/main.c b/vector/v.build.polylines/main.c index 99b174bfd7d..eb27b3fa066 100644 --- a/vector/v.build.polylines/main.c +++ b/vector/v.build.polylines/main.c @@ -146,12 +146,12 @@ int main(int argc, char **argv) /* Open binary vector map at level 2 */ Vect_set_open_level(2); if (Vect_open_old(&map, input->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), input->answer); /* Open new vector */ G_find_vector2(output->answer, ""); if (Vect_open_new(&Out, output->answer, Vect_is_3d(&map)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); /* Copy header info. */ Vect_copy_head_data(&map, &Out); diff --git a/vector/v.build/main.c b/vector/v.build/main.c index bf0a46580fa..1bc9686bb83 100644 --- a/vector/v.build/main.c +++ b/vector/v.build/main.c @@ -114,7 +114,8 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); if (Vect_open_old(&Map, map_opt->answer, G_mapset()) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), + map_opt->answer); Vect_build(&Map); } @@ -124,7 +125,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old(&Map, map_opt->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), map_opt->answer); } if (dump) @@ -150,7 +151,7 @@ int main(int argc, char *argv[]) Cats = Vect_new_cats_struct(); if (Vect_open_new(&Err, err_opt->answer, Vect_is_3d(&Map)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), err_opt->answer); nlines = Vect_get_num_lines(&Map); diff --git a/vector/v.category/main.c b/vector/v.category/main.c index 0ec4a417b01..4a51bf7ee8b 100644 --- a/vector/v.category/main.c +++ b/vector/v.category/main.c @@ -235,9 +235,9 @@ int main(int argc, char *argv[]) break; } if (csv->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=csv instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "csv"); if (format == JSON) { G_fatal_error( _("JSON output and CSV output cannot be used simultaneously.")); diff --git a/vector/v.class/main.c b/vector/v.class/main.c index 4f49f77d770..c993532620a 100644 --- a/vector/v.class/main.c +++ b/vector/v.class/main.c @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) /* open input vector */ Vect_set_open_level(2); if (Vect_open_old2(&Map, map_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_opt->answer); ofield = Vect_get_field_number(&Map, field_opt->answer); @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("Unable to select data from table")); if (nrec == 0) - G_warning(_("No records selected from table <%s>"), Fi->table); + G_warning(_("No records selected from table <%s>."), Fi->table); db_close_database_shutdown_driver(Driver); diff --git a/vector/v.clean/main.c b/vector/v.clean/main.c index 5db2f11347b..5f500435ad7 100644 --- a/vector/v.clean/main.c +++ b/vector/v.clean/main.c @@ -284,19 +284,19 @@ int main(int argc, char *argv[]) * big and build in previous module (like v.in.ogr or other call to v.clean) * would take a long time */ if (Vect_open_old2(&In, opt.in->answer, "", opt.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.in->answer); with_z = Vect_is_3d(&In); if (Vect_open_new(&Out, opt.out->answer, with_z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), opt.out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), opt.out->answer); Vect_set_error_handler_io(&In, &Out); if (opt.err->answer) { Vect_set_open_level(2); if (Vect_open_new(&Err, opt.err->answer, with_z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.err->answer); G_add_error_handler(error_handler_err, &Err); pErr = &Err; diff --git a/vector/v.clean/test/topocheck.c b/vector/v.clean/test/topocheck.c index edbba30172f..1b0861b82be 100644 --- a/vector/v.clean/test/topocheck.c +++ b/vector/v.clean/test/topocheck.c @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old(&In, in_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); with_z = Vect_is_3d(&In); @@ -79,7 +79,8 @@ int main(int argc, char *argv[]) Vect_close(&Out); if (Vect_open_update(&Out, out_opt->answer, G_mapset()) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), + out_opt->answer); /* Count number of areas and total area in input */ nareas1 = Vect_get_num_areas(&Out); diff --git a/vector/v.cluster/main.c b/vector/v.cluster/main.c index af37f88f5ef..145dd1b7a09 100644 --- a/vector/v.cluster/main.c +++ b/vector/v.cluster/main.c @@ -133,7 +133,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("Unable to set predetermined vector open level")); if (1 > Vect_open_old(&In, input->answer, NULL)) - G_fatal_error(_("Unable to open vector map <%s>"), input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), input->answer); /* Check if old vector is 3D. We should preserve 3D data. */ is3d = WITHOUT_Z; @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) clayer = atoi(lyr_opt->answer); if (clayer < 1) - G_fatal_error(_("Option %s must be positive"), lyr_opt->key); + G_fatal_error(_("Option <%s> must be positive."), lyr_opt->key); clmethod = CL_DBSCAN; if (!strcmp(method_opt->answer, "dbscan2")) @@ -193,7 +193,7 @@ int main(int argc, char *argv[]) /* Open new vector for reading/writing */ if (0 > Vect_open_new(&Out, output->answer, is3d)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); } /* Copy header and history data from old to new map */ diff --git a/vector/v.colors.out/main.c b/vector/v.colors.out/main.c index fd91ef39ec0..c2bece36c20 100644 --- a/vector/v.colors.out/main.c +++ b/vector/v.colors.out/main.c @@ -103,7 +103,7 @@ int main(int argc, char **argv) else { fp = fopen(file, "w"); if (!fp) - G_fatal_error(_("Unable to open output file <%s>"), file); + G_fatal_error(_("Unable to open output file '%s'."), file); } if (column) diff --git a/vector/v.colors.out/make_colors.c b/vector/v.colors.out/make_colors.c index 5c77692bdde..120788c129e 100644 --- a/vector/v.colors.out/make_colors.c +++ b/vector/v.colors.out/make_colors.c @@ -20,7 +20,7 @@ struct Colors *make_colors(const char *name, const char *layer, Vect_set_open_level(1); /* no topology required */ if (Vect_open_old2(&Map, name, "", layer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), name); + G_fatal_error(_("Unable to open vector map <%s>."), name); field = Vect_get_field_number(&Map, layer); if (field < 1) @@ -28,7 +28,7 @@ struct Colors *make_colors(const char *name, const char *layer, fi = Vect_get_field(&Map, field); if (!fi) - G_fatal_error(_("Database connection not defined for layer <%s>"), + G_fatal_error(_("Database connection not defined for layer <%s>."), layer); driver = db_start_driver_open_database(fi->driver, fi->database); diff --git a/vector/v.colors.out/scan_cats.c b/vector/v.colors.out/scan_cats.c index e812482d8eb..767215563be 100644 --- a/vector/v.colors.out/scan_cats.c +++ b/vector/v.colors.out/scan_cats.c @@ -16,7 +16,7 @@ void scan_cats(const char *name, const char *layer, int *cmin, int *cmax) Vect_set_open_level(1); /* no topology required */ if (Vect_open_old2(&Map, name, "", layer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), name); + G_fatal_error(_("Unable to open vector map <%s>."), name); ilayer = Vect_get_field_number(&Map, layer); if (ilayer < 1) diff --git a/vector/v.colors/main.c b/vector/v.colors/main.c index a41ee3d11b3..ea57ebe76a9 100644 --- a/vector/v.colors/main.c +++ b/vector/v.colors/main.c @@ -270,7 +270,7 @@ int main(int argc, char *argv[]) /* open map and get min/max values */ Vect_set_open_level(1); /* no topology required */ if (Vect_open_old2(&Map, name, mapset, opt.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), name); + G_fatal_error(_("Unable to open vector map <%s>."), name); Vect_set_error_handler_io(&Map, NULL); if (use == USE_Z && !Vect_is_3d(&Map)) @@ -311,7 +311,7 @@ int main(int argc, char *argv[]) if (opt.rast->answer) { cmapset = G_find_raster2(cmap, ""); if (!cmapset) - G_fatal_error(_("Raster map <%s> not found"), cmap); + G_fatal_error(_("Raster map <%s> not found."), cmap); if (Rast_read_colors(cmap, cmapset, &colors) < 0) G_fatal_error( @@ -320,7 +320,7 @@ int main(int argc, char *argv[]) else if (opt.volume->answer) { cmapset = G_find_raster3d(cmap, ""); if (!cmapset) - G_fatal_error(_("3D raster map <%s> not found"), cmap); + G_fatal_error(_("3D raster map <%s> not found."), cmap); if (Rast3d_read_colors(cmap, cmapset, &colors) < 0) G_fatal_error( diff --git a/vector/v.colors/read_rgb.c b/vector/v.colors/read_rgb.c index c6e762ca0af..36c22aef771 100644 --- a/vector/v.colors/read_rgb.c +++ b/vector/v.colors/read_rgb.c @@ -20,7 +20,8 @@ void rgb2colr(struct Map_info *Map, int layer, const char *rgb_column, fi = Vect_get_field(Map, layer); if (!fi) - G_fatal_error(_("Database connection not defined for layer %d"), layer); + G_fatal_error(_("Database connection not defined for layer %d."), + layer); driver = db_start_driver_open_database(fi->driver, fi->database); if (!driver) diff --git a/vector/v.colors/scan_attr.c b/vector/v.colors/scan_attr.c index e805cd74a7f..a6040db79c1 100644 --- a/vector/v.colors/scan_attr.c +++ b/vector/v.colors/scan_attr.c @@ -21,7 +21,8 @@ int scan_attr(struct Map_info *Map, int layer, const char *column_name, fi = Vect_get_field(Map, layer); if (!fi) - G_fatal_error(_("Database connection not defined for layer %d"), layer); + G_fatal_error(_("Database connection not defined for layer %d."), + layer); driver = db_start_driver_open_database(fi->driver, fi->database); if (!driver) diff --git a/vector/v.colors/write_rgb.c b/vector/v.colors/write_rgb.c index 2f22a23423a..6b3f0ae102c 100644 --- a/vector/v.colors/write_rgb.c +++ b/vector/v.colors/write_rgb.c @@ -17,7 +17,8 @@ void write_rgb_values(struct Map_info *Map, int layer, const char *column_name, fi = Vect_get_field(Map, layer); if (!fi) - G_fatal_error(_("Database connection not defined for layer %d"), layer); + G_fatal_error(_("Database connection not defined for layer %d."), + layer); driver = db_start_driver_open_database(fi->driver, fi->database); if (!driver) diff --git a/vector/v.db.connect/main.c b/vector/v.db.connect/main.c index bbc0ac6237a..b8f89e9f182 100644 --- a/vector/v.db.connect/main.c +++ b/vector/v.db.connect/main.c @@ -168,9 +168,9 @@ int main(int argc, char **argv) } if (csv_print->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=csv instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "csv"); if (format == JSON) { G_fatal_error(_("The -g flag cannot be used with format=json. " "Please select only one output format.")); @@ -211,7 +211,7 @@ int main(int argc, char **argv) Vect_set_open_level(1); /* no topology needed */ if (print->answer || csv_print->answer || columns->answer) { if (Vect_open_old2(&Map, inopt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), inopt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), inopt->answer); } else { if (Vect_open_update_head(&Map, inopt->answer, G_mapset()) < 1) @@ -327,7 +327,7 @@ int main(int argc, char **argv) if ((fi = Vect_get_field2(&Map, field_opt->answer)) == NULL) G_fatal_error( - _("Database connection not defined for layer <%s>"), + _("Database connection not defined for layer <%s>."), field_opt->answer); driver = db_start_driver(fi->driver); if (driver == NULL) @@ -533,7 +533,8 @@ int main(int argc, char **argv) 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( diff --git a/vector/v.db.select/main.c b/vector/v.db.select/main.c index 3263cd4cf1a..f9e5ada9e55 100644 --- a/vector/v.db.select/main.c +++ b/vector/v.db.select/main.c @@ -180,7 +180,7 @@ int main(int argc, char **argv) /* set input vector map name and mapset */ if (options.file->answer && strcmp(options.file->answer, "-") != 0) { if (NULL == freopen(options.file->answer, "w", stdout)) - G_fatal_error(_("Unable to open file <%s> for writing"), + G_fatal_error(_("Unable to open file '%s' for writing."), options.file->answer); } @@ -199,7 +199,8 @@ int main(int argc, char **argv) options.format, flags.colnames, _("Column names are always included")); fatal_error_option_value_excludes_option( - options.format, options.fsep, _("Separator is part of the format")); + options.format, options.fsep, + _("Separator is part of the format.")); fatal_error_option_value_excludes_option( options.format, options.nullval, _("Null value is part of the format")); @@ -266,7 +267,7 @@ int main(int argc, char **argv) else { if (Vect_open_old_head2(&Map, options.map->answer, "", options.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), options.map->answer); /* field_number won't be used, but is initialized to suppress compiler * warnings. */ @@ -274,7 +275,7 @@ int main(int argc, char **argv) } if ((Fi = Vect_get_field2(&Map, options.field->answer)) == NULL) - G_fatal_error(_("Database connection not defined for layer <%s>"), + G_fatal_error(_("Database connection not defined for layer <%s>."), options.field->answer); driver = db_start_driver_open_database(Fi->driver, Fi->database); diff --git a/vector/v.decimate/main.c b/vector/v.decimate/main.c index e5e22b01e90..556501ef88d 100644 --- a/vector/v.decimate/main.c +++ b/vector/v.decimate/main.c @@ -136,7 +136,7 @@ int main(int argc, char **argv) zrange_opt->type = TYPE_DOUBLE; zrange_opt->required = NO; zrange_opt->key_desc = "min,max"; - zrange_opt->description = _("Filter range for z data (min,max)"); + zrange_opt->description = _("Filter range for Z data (min,max)"); zrange_opt->guisection = _("Selection"); cats_opt = G_define_standard_option(G_OPT_V_CATS); @@ -262,7 +262,7 @@ int main(int argc, char **argv) G_FATAL_EXIT); if (Vect_open_old2(&vinput, map_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_opt->answer); int layer = Vect_get_field_number(&vinput, field_opt->answer); if (layer < 1 && (cats_opt->answer || cat_in_grid_flg->answer)) @@ -382,7 +382,7 @@ int main(int argc, char **argv) } if (Vect_open_new(&voutput, voutput_opt->answer, Vect_is_3d(&vinput)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), voutput_opt->answer); /* some constraints can be set on the map */ diff --git a/vector/v.delaunay/main.c b/vector/v.delaunay/main.c index fcd0bbc8060..644f1bb2bea 100644 --- a/vector/v.delaunay/main.c +++ b/vector/v.delaunay/main.c @@ -114,13 +114,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&In, in_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); /* check if we have a 3D input points map */ mode3d = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, out_opt->answer, mode3d)) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_hist_copy(&In, &Out); Vect_hist_command(&Out); diff --git a/vector/v.distance/main.c b/vector/v.distance/main.c index 87d158971cc..3cae5b2e04e 100644 --- a/vector/v.distance/main.c +++ b/vector/v.distance/main.c @@ -391,7 +391,7 @@ int main(int argc, char *argv[]) /* Open 'from' vector */ Vect_set_open_level(2); if (Vect_open_old2(&From, opt.from->answer, "", opt.from_field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.from->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.from->answer); from_field = Vect_get_field_number(&From, opt.from_field->answer); /* in 3D features may not be found */ @@ -414,7 +414,7 @@ int main(int argc, char *argv[]) /* Open 'to' vector */ Vect_set_open_level(2); if (Vect_open_old2(&To, opt.to->answer, "", opt.to_field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.to->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.to->answer); /* in 3D features may not be found */ if (Vect_is_3d(&To)) G_warning(_("Input vector map <%s> is 3D"), opt.to->answer); @@ -439,7 +439,7 @@ int main(int argc, char *argv[]) /* Open output vector */ if (create_map) { if (Vect_open_new(&Out, opt.out->answer, WITHOUT_Z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.out->answer); Vect_hist_command(&Out); @@ -550,7 +550,7 @@ int main(int argc, char *argv[]) if (update_table) { Fi = Vect_get_field(&From, from_field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer <%s>"), + G_fatal_error(_("Database connection not defined for layer <%s>."), opt.from_field->answer); driver = db_start_driver_open_database(Fi->driver, Fi->database); @@ -583,7 +583,7 @@ int main(int argc, char *argv[]) toFi = Vect_get_field(&To, to_field); if (toFi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), to_field); to_driver = db_start_driver_open_database(toFi->driver, toFi->database); @@ -632,7 +632,7 @@ int main(int argc, char *argv[]) Fi = Vect_get_field(&From, from_field); if (Fi == NULL) G_fatal_error( - _("Database connection not defined for layer <%s>"), + _("Database connection not defined for layer <%s>."), opt.from_field->answer); driver = @@ -847,7 +847,7 @@ int main(int argc, char *argv[]) Near = (NEAR *)G_realloc(Near, anear * sizeof(NEAR)); if (!Near) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); } near = &(Near[count]); @@ -926,7 +926,7 @@ int main(int argc, char *argv[]) Near = (NEAR *)G_realloc(Near, anear * sizeof(NEAR)); if (!Near) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); } near = &(Near[count]); @@ -1139,7 +1139,7 @@ int main(int argc, char *argv[]) Near = (NEAR *)G_realloc(Near, anear * sizeof(NEAR)); if (!Near) - G_fatal_error(_("Out of memory!")); + G_fatal_error(_("Out of memory.")); } near = &(Near[count]); @@ -1472,7 +1472,7 @@ int main(int argc, char *argv[]) G_debug(3, "SQL: %s", db_get_string(&stmt)); if (db_execute_immediate(driver, &stmt) != DB_OK) - G_fatal_error(_("Unable to create table: '%s'"), + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&stmt)); if (db_grant_on_table(driver, opt.table->answer, DB_PRIV_SELECT, diff --git a/vector/v.drape/main.c b/vector/v.drape/main.c index dcd3bdc78a8..4556995f123 100644 --- a/vector/v.drape/main.c +++ b/vector/v.drape/main.c @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); /* topology required ? */ if (Vect_open_old2(&In, opt.input->answer, "", opt.layer->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.input->answer); Vect_set_error_handler_io(&In, &Out); @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) /* create output */ if (Vect_open_new(&Out, opt.output->answer, WITH_Z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.output->answer); Vect_copy_head_data(&In, &Out); @@ -195,7 +195,7 @@ int main(int argc, char *argv[]) } /* copy attribute data */ - G_important_message(_("Copying attribute tables...")); + G_important_message(_("Copying attribute table(s)...")); if (layer < 0) Vect_copy_tables(&In, &Out, 0); else diff --git a/vector/v.edit/main.c b/vector/v.edit/main.c index 3342fd434aa..d5f157c790d 100644 --- a/vector/v.edit/main.c +++ b/vector/v.edit/main.c @@ -76,7 +76,8 @@ int main(int argc, char *argv[]) if (strcmp(params.in->answer, "-") != 0) { ascii = fopen(params.in->answer, "r"); if (ascii == NULL) - G_fatal_error(_("Unable to open file <%s>"), params.in->answer); + G_fatal_error(_("Unable to open file '%s'."), + params.in->answer); } else { ascii = stdin; @@ -93,7 +94,7 @@ int main(int argc, char *argv[]) (!G_find_file("", "OGR", G_mapset()) && !G_find_file("", "PG", G_mapset()))) { if (!overwrite) - G_fatal_error(_("Vector map <%s> already exists"), + G_fatal_error(_("Vector map <%s> already exists."), params.map->answer); } @@ -101,7 +102,7 @@ int main(int argc, char *argv[]) putenv("GRASS_VECTOR_EXTERNAL_IMMEDIATE=1"); ret = Vect_open_new(&Map, params.map->answer, WITHOUT_Z); if (ret == -1) { - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), params.map->answer); } Vect_set_error_handler_io(NULL, &Map); @@ -118,7 +119,7 @@ int main(int argc, char *argv[]) _("Supported feature types for non-native formats:")); /* create OGR or PostGIS layer */ if (Vect_write_line(&Map, type, NULL, NULL) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), params.map->answer); } @@ -170,7 +171,7 @@ int main(int argc, char *argv[]) BgMap[nbgmaps - 1] = (struct Map_info *)G_malloc(sizeof(struct Map_info)); if (Vect_open_old(BgMap[nbgmaps - 1], bmap, "") == -1) - G_fatal_error(_("Unable to open vector map <%s>"), bmap); + G_fatal_error(_("Unable to open vector map <%s>."), bmap); G_verbose_message(_("Background vector map <%s> registered"), bmap); i++; } @@ -245,7 +246,7 @@ int main(int argc, char *argv[]) if (Vect_open_update2(&Map, params.map->answer, G_mapset(), params.fld->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), params.map->answer); } } diff --git a/vector/v.edit/select.c b/vector/v.edit/select.c index d72cf74c247..1970ecc0f7b 100644 --- a/vector/v.edit/select.c +++ b/vector/v.edit/select.c @@ -492,7 +492,8 @@ int sel_by_where(struct Map_info *Map, int layer, int type, char *where, Fi = Vect_get_field(Map, layer); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer %d"), layer); + G_fatal_error(_("Database connection not defined for layer %d."), + layer); } driver = db_start_driver(Fi->driver); diff --git a/vector/v.external/list.c b/vector/v.external/list.c index fbaadc8380d..c3e55ffaf3c 100644 --- a/vector/v.external/list.c +++ b/vector/v.external/list.c @@ -252,7 +252,7 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) /* open OGR DSN */ Ogr_ds = OGROpen(dsn, FALSE, NULL); if (!Ogr_ds) { - G_fatal_error(_("Unable to open data source '%s'"), dsn); + G_fatal_error(_("Unable to open data source <%s>."), dsn); } /* Make a list of available layers */ diff --git a/vector/v.external/main.c b/vector/v.external/main.c index 58d1fca2178..ebe5f0e9e04 100644 --- a/vector/v.external/main.c +++ b/vector/v.external/main.c @@ -131,7 +131,7 @@ int main(int argc, char *argv[]) GDALOpenEx(options.dsn->answer, GDAL_OF_VECTOR, NULL, NULL, NULL); } if (Ogr_ds == NULL) - G_fatal_error(_("Unable to open data source <%s>"), dsn); + G_fatal_error(_("Unable to open data source <%s>."), dsn); G_get_window(&cellhd); @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) putenv("GRASS_VECTOR_EXTERNAL_IGNORE=1"); if (Vect_open_new(&Map, output, WITHOUT_Z) < 0) /* dimension is set later from data source */ - G_fatal_error(_("Unable to create vector map <%s>"), output); + G_fatal_error(_("Unable to create vector map <%s>."), output); Vect_set_error_handler_io(NULL, &Map); Vect_hist_command(&Map); @@ -173,7 +173,7 @@ int main(int argc, char *argv[]) G_mapset(), GV_DIRECTORY, output); G_debug(2, "Delete '%s'", buf); if (unlink(buf) == -1) { - G_fatal_error(_("Unable to delete '%s'"), buf); + G_fatal_error(_("Unable to delete <%s>."), buf); } /* create frmt file */ @@ -209,7 +209,7 @@ int main(int argc, char *argv[]) if (!flags.topo->answer) { Vect_set_open_level(1); if (Vect_open_old(&Map, output, G_mapset()) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), output); + G_fatal_error(_("Unable to open vector map <%s>."), output); Vect_build(&Map); Vect_close(&Map); } diff --git a/vector/v.external/proj.c b/vector/v.external/proj.c index 572890136e0..37321926161 100644 --- a/vector/v.external/proj.c +++ b/vector/v.external/proj.c @@ -181,7 +181,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int layer, if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, srid, wkt)) { - G_fatal_error(_("Unable to create new project <%s>"), outloc); + G_fatal_error(_("Unable to create new project <%s>."), outloc); } G_message(_("Project <%s> created"), outloc); @@ -353,8 +353,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int layer, msg_fn = G_message; else msg_fn = G_verbose_message; - msg_fn(_("Coordinate reference system of input dataset and current " - "project appear to match")); + msg_fn(_("Coordinate reference system of input dataset and " + "current project appear to match.")); if (check_only) { GDALClose(hDS); diff --git a/vector/v.extract/extract.c b/vector/v.extract/extract.c index b68d5f76dfa..0af047baa64 100644 --- a/vector/v.extract/extract.c +++ b/vector/v.extract/extract.c @@ -265,7 +265,7 @@ int extract_line(int num_index, int *num_array, struct Map_info *In, if (dissolve_key) { Fi = Vect_get_field(In, field); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer <%d>"), + G_fatal_error(_("Database connection not defined for layer %d."), field); } diff --git a/vector/v.extract/main.c b/vector/v.extract/main.c index c30b082400e..010c6468076 100644 --- a/vector/v.extract/main.c +++ b/vector/v.extract/main.c @@ -187,7 +187,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); /* topology required */ if (Vect_open_old2(&In, input, "", opt.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input); + G_fatal_error(_("Unable to open vector map <%s>."), input); field = Vect_get_field_number(&In, opt.field->answer); @@ -211,7 +211,7 @@ int main(int argc, char **argv) Fi = Vect_get_field(&In, field); if (!Fi) { G_fatal_error( - _("Database connection not defined for layer <%s>"), + _("Database connection not defined for layer <%s>."), opt.field->answer); } @@ -309,7 +309,7 @@ int main(int argc, char **argv) else if (opt.where->answer != NULL) { Fi = Vect_get_field(&In, field); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer <%s>"), + G_fatal_error(_("Database connection not defined for layer <%s>."), opt.field->answer); } @@ -403,7 +403,7 @@ int main(int argc, char **argv) } if (Vect_open_new(&Out, output, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output); + G_fatal_error(_("Unable to create vector map <%s>."), output); Vect_hist_copy(&In, &Out); Vect_hist_command(&Out); diff --git a/vector/v.extrude/main.c b/vector/v.extrude/main.c index fc58cf18895..84cc1c72317 100644 --- a/vector/v.extrude/main.c +++ b/vector/v.extrude/main.c @@ -182,13 +182,13 @@ int main(int argc, char *argv[]) /* opening input vector map */ if (Vect_open_old2(&In, opt.input->answer, "", opt.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.input->answer); Vect_set_error_handler_io(&In, &Out); /* creating output vector map */ if (Vect_open_new(&Out, opt.output->answer, WITH_Z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.output->answer); field = Vect_get_field_number(&In, opt.field->answer); @@ -217,7 +217,7 @@ int main(int argc, char *argv[]) dbColumn *column; if ((Fi = Vect_get_field(&In, field)) == NULL) - 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, @@ -228,7 +228,8 @@ int main(int argc, char *argv[]) if (db_get_column(driver, Fi->table, opt.hcolumn->answer, &column) != DB_OK) - G_fatal_error(_("Column <%s> does not exist"), opt.hcolumn->answer); + G_fatal_error(_("Column <%s> does not exist."), + opt.hcolumn->answer); else db_free_column(column); diff --git a/vector/v.fill.holes/main.c b/vector/v.fill.holes/main.c index 6482a0ae67f..7928723e0b0 100644 --- a/vector/v.fill.holes/main.c +++ b/vector/v.fill.holes/main.c @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) if (1 > Vect_open_old2(&input, options.input->answer, "", options.field->answer)) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), options.input->answer); /* Check if old vector is 3D. We should preserve 3D data. */ @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) /* Open new vector for reading/writing */ if (0 > Vect_open_new(&output, options.output->answer, open3d)) { - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), options.output->answer); } diff --git a/vector/v.generalize/main.c b/vector/v.generalize/main.c index 598d88de941..f7d30b3d0a4 100644 --- a/vector/v.generalize/main.c +++ b/vector/v.generalize/main.c @@ -318,7 +318,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&In, map_in->answer, "", field_opt->answer) < 1) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); if (Vect_get_num_primitives(&In, mask_type) == 0) { G_warning(_("No lines found in input map <%s>"), map_in->answer); @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } if (error_out->answer) { diff --git a/vector/v.generalize/matrix.c b/vector/v.generalize/matrix.c index bda7688f962..680150f2ac4 100644 --- a/vector/v.generalize/matrix.c +++ b/vector/v.generalize/matrix.c @@ -136,7 +136,7 @@ int matrix_inverse(MATRIX *a, MATRIX *res, int percents) /* initialize output matrix to the identity matrix */ if (!matrix_init(a->rows, a->rows, res)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return 0; } for (i = 0; i < a->rows; i++) { diff --git a/vector/v.generalize/misc.c b/vector/v.generalize/misc.c index bd69ddff906..c55c20ca0a6 100644 --- a/vector/v.generalize/misc.c +++ b/vector/v.generalize/misc.c @@ -161,7 +161,7 @@ int copy_tables_by_cats(struct Map_info *In, struct Map_info *Out) /* Make a list of categories */ IFi = Vect_get_field(In, fields[i]); if (!IFi) { /* no table */ - G_warning(_("Database connection not defined for layer %d"), + G_warning(_("Database connection not defined for layer %d."), fields[i]); continue; } diff --git a/vector/v.generalize/network.c b/vector/v.generalize/network.c index f0071ac5cc6..5cff96da90c 100644 --- a/vector/v.generalize/network.c +++ b/vector/v.generalize/network.c @@ -88,7 +88,7 @@ int graph_generalization(struct Map_info *In, struct Map_info *Out, /* build own graph by edge<->vertex */ /* each vertex represents undirected edge */ if (!graph_init(&g, dglGet_EdgeCount(gr) / 2 + 1)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return 0; } @@ -121,7 +121,7 @@ int graph_generalization(struct Map_info *In, struct Map_info *Out, g.edge[id] = G_malloc(sizeof(int) * (to_degree + from_degree)); if (!g.edge[id]) { graph_free(&g); - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return 0; } } diff --git a/vector/v.generalize/simplification.c b/vector/v.generalize/simplification.c index 6463de464bc..b0eb68698e9 100644 --- a/vector/v.generalize/simplification.c +++ b/vector/v.generalize/simplification.c @@ -25,7 +25,7 @@ int douglas_peucker(struct line_pnts *Points, double thresh, int with_z) int *stack = G_malloc(sizeof(int) * Points->n_points * 2); if (!stack) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return Points->n_points; } @@ -33,7 +33,7 @@ int douglas_peucker(struct line_pnts *Points, double thresh, int with_z) sizeof(int) * Points->n_points); /* Indices of points in output line */ if (!index) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); G_free(stack); return Points->n_points; } @@ -297,7 +297,7 @@ int douglas_peucker_reduction(struct line_pnts *Points, double thresh, sel = G_calloc(sizeof(int), n); if (sel == NULL) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } @@ -306,7 +306,7 @@ int douglas_peucker_reduction(struct line_pnts *Points, double thresh, index = G_malloc(sizeof(int) * 3 * n); if (index == NULL) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); G_free(sel); return n; } @@ -330,7 +330,7 @@ int douglas_peucker_reduction(struct line_pnts *Points, double thresh, binary_heap pq; if (!binary_heap_init(n, &pq)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); G_free(sel); G_free(index); return n; diff --git a/vector/v.generalize/smoothing.c b/vector/v.generalize/smoothing.c index caeb177ff30..5345a269dc6 100644 --- a/vector/v.generalize/smoothing.c +++ b/vector/v.generalize/smoothing.c @@ -135,7 +135,7 @@ int sliding_averaging(struct line_pnts *Points, double slide, int look_ahead, res = G_malloc(sizeof(POINT) * (n + half)); if (!res) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } @@ -220,7 +220,7 @@ int distance_weighting(struct line_pnts *Points, double slide, int look_ahead, res = (POINT *)G_malloc(sizeof(POINT) * (n + half)); if (!res) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } @@ -362,7 +362,7 @@ int chaiken(struct line_pnts *Points, double thresh, int loop_support, } if (point_list_copy_to_line_pnts(head, Points) == -1) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } point_list_free(head); @@ -518,7 +518,7 @@ int hermite(struct line_pnts *Points, double step, double angle_thresh, point_list_add(last, p0); if (point_list_copy_to_line_pnts(head, Points) == -1) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); point_list_free(head); @@ -563,31 +563,31 @@ int snakes(struct line_pnts *Points, double alpha, double beta, } if (!matrix_init(n + 2 * plus, n + 2 * plus, &g)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } if (!matrix_init(n + 2 * plus, 1, &xcoord)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } if (!matrix_init(n + 2 * plus, 1, &ycoord)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } if (!matrix_init(n + 2 * plus, 1, &zcoord)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } if (!matrix_init(n + 2 * plus, 1, &xout)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } if (!matrix_init(n + 2 * plus, 1, &yout)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } if (!matrix_init(n + 2 * plus, 1, &zout)) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); return n; } diff --git a/vector/v.hull/main.c b/vector/v.hull/main.c index 807d5548dce..165e589527b 100644 --- a/vector/v.hull/main.c +++ b/vector/v.hull/main.c @@ -79,7 +79,7 @@ int main(int argc, char **argv) Vect_set_open_level(1); if (Vect_open_old2(&Map, sitefile, "", field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), sitefile); + G_fatal_error(_("Unable to open vector map <%s>."), sitefile); layer = Vect_get_field_number(&Map, field->answer); @@ -116,7 +116,7 @@ int main(int argc, char **argv) /* create output vector map */ if (0 > Vect_open_new(&Map, output->answer, MODE2D ? WITHOUT_Z : WITH_Z)) { - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); } Vect_hist_command(&Map); diff --git a/vector/v.in.ascii/main.c b/vector/v.in.ascii/main.c index b3de963d0b1..dc85d37f2fd 100644 --- a/vector/v.in.ascii/main.c +++ b/vector/v.in.ascii/main.c @@ -246,7 +246,7 @@ int main(int argc, char *argv[]) } if (Vect_open_new(&Map, new->answer, zcoor) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), new->answer); + G_fatal_error(_("Unable to create vector map <%s>."), new->answer); Vect_set_error_handler_io(NULL, &Map); Vect_hist_command(&Map); @@ -422,7 +422,7 @@ int main(int argc, char *argv[]) /* Create table */ G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: %s"), + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } diff --git a/vector/v.in.ascii/points.c b/vector/v.in.ascii/points.c index 0800c52f284..a8fa152f03a 100644 --- a/vector/v.in.ascii/points.c +++ b/vector/v.in.ascii/points.c @@ -482,7 +482,7 @@ int points_to_bin(FILE *ascii, int rowlen, struct Map_info *Map, G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to insert new record: %s"), + G_fatal_error(_("Unable to insert new record: '%s'."), db_get_string(&sql)); } } diff --git a/vector/v.in.db/main.c b/vector/v.in.db/main.c index 0d5b345890b..a9c62328aa3 100644 --- a/vector/v.in.db/main.c +++ b/vector/v.in.db/main.c @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) } if (Vect_open_new(&Map, outvect->answer, with_z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), outvect->answer); + G_fatal_error(_("Unable to create vector map <%s>."), outvect->answer); Vect_set_error_handler_io(NULL, &Map); @@ -230,7 +230,7 @@ int main(int argc, char *argv[]) G_debug(2, "SQL: %s", db_get_string(&sql)); if (db_open_select_cursor(driver, &sql, &cursor, DB_SEQUENTIAL) != DB_OK) { - G_fatal_error(_("Unable to open select cursor: '%s'"), + G_fatal_error(_("Unable to open select cursor: '%s'."), db_get_string(&sql)); } diff --git a/vector/v.in.dxf/main.c b/vector/v.in.dxf/main.c index 97311f54861..d7ae31f7ecd 100644 --- a/vector/v.in.dxf/main.c +++ b/vector/v.in.dxf/main.c @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) /* create vector map */ if (Vect_open_new(&Map, output, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output); + G_fatal_error(_("Unable to create vector map <%s>."), output); Vect_set_map_name(&Map, output); diff --git a/vector/v.in.dxf/write_vect.c b/vector/v.in.dxf/write_vect.c index 6787fabc438..5b84752969a 100644 --- a/vector/v.in.dxf/write_vect.c +++ b/vector/v.in.dxf/write_vect.c @@ -70,7 +70,7 @@ void write_vect(struct Map_info *Map, char *layer, char *entity, char *handle, db_set_string(&sql, buf); if (db_execute_immediate(driver, &sql) != DB_OK) - G_fatal_error(_("Unable to insert new record: %s"), + G_fatal_error(_("Unable to insert new record: '%s'."), db_get_string(&sql)); db_free_string(&sql); } @@ -234,7 +234,7 @@ static int get_field_cat(struct Map_info *Map, char *layer, int *field, db_set_string(&sql, buf); if (db_execute_immediate(driver, &sql) != DB_OK) - G_fatal_error(_("Unable to create table: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); db_free_string(&sql); if (db_grant_on_table(driver, Fi[i]->table, DB_PRIV_SELECT, diff --git a/vector/v.in.lidar/attributes.c b/vector/v.in.lidar/attributes.c index 341682f68bb..2bdf65394e3 100644 --- a/vector/v.in.lidar/attributes.c +++ b/vector/v.in.lidar/attributes.c @@ -131,7 +131,7 @@ void create_table_for_lidar(struct Map_info *vector_map, const char *name, db_set_error_handler_driver(driver); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(driver, Fi->table, cat_col_name) != DB_OK) diff --git a/vector/v.in.lidar/main.c b/vector/v.in.lidar/main.c index 91a34181d27..1c608b7cd08 100644 --- a/vector/v.in.lidar/main.c +++ b/vector/v.in.lidar/main.c @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) zrange_opt->type = TYPE_DOUBLE; zrange_opt->required = NO; zrange_opt->key_desc = "min,max"; - zrange_opt->description = _("Filter range for z data (min,max)"); + zrange_opt->description = _("Filter range for Z data (min,max)"); zrange_opt->guisection = _("Selection"); filter_opt = G_define_option(); @@ -515,7 +515,7 @@ int main(int argc, char *argv[]) else { if (0 != G_make_location(outloc_opt->answer, &cellhd, proj_info, proj_units)) { - G_fatal_error(_("Unable to create new project <%s>"), + G_fatal_error(_("Unable to create new project <%s>."), outloc_opt->answer); } G_message(_("Project <%s> created"), outloc_opt->answer); @@ -549,7 +549,7 @@ int main(int argc, char *argv[]) _("Vector map <%s> already exists and will be overwritten"), out_opt->answer); else - G_fatal_error(_("Vector map <%s> already exists"), + G_fatal_error(_("Vector map <%s> already exists."), out_opt->answer); } } @@ -559,7 +559,7 @@ int main(int argc, char *argv[]) /* strip any @mapset from vector output name */ G_find_vector(buf, G_mapset()); if (Vect_open_new(&Map, out_opt->answer, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_hist_command(&Map); diff --git a/vector/v.in.lidar/projection.c b/vector/v.in.lidar/projection.c index 79a227387f2..494dc96293d 100644 --- a/vector/v.in.lidar/projection.c +++ b/vector/v.in.lidar/projection.c @@ -129,8 +129,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, loc_proj_units, proj_info, proj_units, err); } else if (verbose) { - G_message(_( - "Coordinate reference system of input dataset and current project " - "appear to match")); + G_message(_("Coordinate reference system of input dataset and current " + "project appear to match.")); } } diff --git a/vector/v.in.ogr/main.c b/vector/v.in.ogr/main.c index 5717ab9da4d..1d4224ac0ef 100644 --- a/vector/v.in.ogr/main.c +++ b/vector/v.in.ogr/main.c @@ -545,7 +545,7 @@ int main(int argc, char *argv[]) GDALOpenEx(dsn, GDAL_OF_VECTOR, NULL, (const char **)doo, NULL); } if (Ogr_ds == NULL) - G_fatal_error(_("Unable to open data source <%s>"), dsn); + G_fatal_error(_("Unable to open data source <%s>."), dsn); /* driver name */ ogr_driver_name = GDALGetDriverShortName(GDALGetDatasetDriver(Ogr_ds)); @@ -689,7 +689,7 @@ int main(int argc, char *argv[]) /* Check if the output map exists */ if (G_find_vector2(output, G_mapset()) && !overwrite) { GDALClose(Ogr_ds); - G_fatal_error(_("Vector map <%s> already exists"), output); + G_fatal_error(_("Vector map <%s> already exists."), output); } /* report back if several layers will be imported because @@ -864,7 +864,7 @@ int main(int argc, char *argv[]) G_find_vector(output, G_mapset()); if (Vect_open_new(&Map, output, with_z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output); + G_fatal_error(_("Unable to create vector map <%s>."), output); Out = ⤅ @@ -1057,7 +1057,7 @@ int main(int argc, char *argv[]) OFTIntegerListlength); col_info[i_out].type = G_store(buf); G_warning(_("Writing column <%s> with fixed length %d " - "chars (may be truncated)"), + "chars (may be truncated)."), Ogr_fieldname, OFTIntegerListlength); } else if (Ogr_ftype == OFTReal) { @@ -1099,8 +1099,8 @@ int main(int argc, char *argv[]) snprintf(buf, sizeof(buf), "varchar ( %d )", OFTIntegerListlength); col_info[i_out].type = G_store(buf); - 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 { @@ -1168,7 +1168,7 @@ int main(int argc, char *argv[]) if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database(driver); db_shutdown_driver(driver); - G_fatal_error(_("Unable to create table: '%s'"), + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } @@ -1393,7 +1393,7 @@ int main(int argc, char *argv[]) snprintf(buf, sizeof(buf), "drop table %s", Fi->table); db_set_string(&sql, buf); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to drop table: '%s'"), + G_fatal_error(_("Unable to drop table: '%s'."), db_get_string(&sql)); } } diff --git a/vector/v.in.ogr/proj.c b/vector/v.in.ogr/proj.c index 2144ac3344f..1d5abeed9ea 100644 --- a/vector/v.in.ogr/proj.c +++ b/vector/v.in.ogr/proj.c @@ -251,7 +251,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int layer, if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, srid, wkt)) { - G_fatal_error(_("Unable to create new project <%s>"), outloc); + G_fatal_error(_("Unable to create new project <%s>."), outloc); } G_message(_("Project <%s> created"), outloc); @@ -423,8 +423,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int layer, msg_fn = G_message; else msg_fn = G_verbose_message; - msg_fn(_("Coordinate reference system of input dataset and current " - "project appear to match")); + msg_fn(_("Coordinate reference system of input dataset and " + "current project appear to match.")); if (check_only) { GDALClose(hDS); diff --git a/vector/v.in.pdal/main.cpp b/vector/v.in.pdal/main.cpp index f9cc6ff9660..09833edd2fb 100644 --- a/vector/v.in.pdal/main.cpp +++ b/vector/v.in.pdal/main.cpp @@ -185,7 +185,7 @@ int main(int argc, char *argv[]) zrange_opt->type = TYPE_DOUBLE; zrange_opt->required = NO; zrange_opt->key_desc = "min,max"; - zrange_opt->description = _("Filter range for z data (min,max)"); + zrange_opt->description = _("Filter range for Z data (min,max)"); zrange_opt->guisection = _("Selection"); Option *filter_opt = G_define_option(); @@ -468,7 +468,7 @@ int main(int argc, char *argv[]) // the overwrite warning comes quite late in the execution // but that's good enough if (Vect_open_new(&output_vector, out_opt->answer, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_hist_command(&output_vector); // this is just for sure, we test the individual dimensions before diff --git a/vector/v.in.pdal/projection.c b/vector/v.in.pdal/projection.c index d2e03c36fe6..6b63da7ec57 100644 --- a/vector/v.in.pdal/projection.c +++ b/vector/v.in.pdal/projection.c @@ -130,8 +130,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, } else { if (verbose) { - G_message(_("Coordinate reference system of the input dataset and " - "current project appear to match")); + G_message(_("Coordinate reference system of input dataset and " + "current project appear to match.")); } } } diff --git a/vector/v.in.region/main.c b/vector/v.in.region/main.c index a848982a765..aa4e0cb9ab7 100644 --- a/vector/v.in.region/main.c +++ b/vector/v.in.region/main.c @@ -68,7 +68,7 @@ int main(int argc, char **argv) /* Open output segments */ if (Vect_open_new(&Out, out_opt->answer, 0) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_hist_command(&Out); diff --git a/vector/v.info/main.c b/vector/v.info/main.c index 2c3c5f70559..30d26ca01b9 100644 --- a/vector/v.info/main.c +++ b/vector/v.info/main.c @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) Vect_close(&Map); Vect_set_open_level(1); /* no topology */ if (Vect_open_old2(&Map, input_opt, "", field_opt) < 1) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), Vect_get_full_name(&Map)); /* level one info not needed for history, title, columns */ diff --git a/vector/v.kcv/main.c b/vector/v.kcv/main.c index 01bf81564d4..5ac0940cd91 100644 --- a/vector/v.kcv/main.c +++ b/vector/v.kcv/main.c @@ -174,7 +174,7 @@ int main(int argc, char *argv[]) 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"), Fi->table); + G_warning(_("Cannot grant privileges on table <%s>."), Fi->table); G_important_message(_("Select privileges were granted on the table")); @@ -204,7 +204,7 @@ int main(int argc, char *argv[]) /* array of available partitions */ part = (struct partition *)G_calloc(np, sizeof(struct partition)); if (!part) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); /* line index */ line_idx = (int *)G_calloc(nlines, sizeof(int)); @@ -279,7 +279,8 @@ int main(int argc, char *argv[]) G_debug(3, "SQL: %s", db_get_string(&sql)); if (db_execute_immediate(Driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to insert row: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to insert new row: '%s'."), + db_get_string(&sql)); } /* increase count of features in partition */ diff --git a/vector/v.kernel/main.c b/vector/v.kernel/main.c index bf47e462a1e..0c8d36e0ab9 100644 --- a/vector/v.kernel/main.c +++ b/vector/v.kernel/main.c @@ -320,7 +320,7 @@ int main(int argc, char **argv) /* Open input vector */ Vect_set_open_level(2); if (Vect_open_old(&In, in_opt->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); if (net_opt->answer) { int nlines, line; @@ -333,13 +333,14 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&Net, net_opt->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), net_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), + net_opt->answer); Vect_net_build_graph(&Net, GV_LINES, 0, 0, NULL, NULL, NULL, 0, 0); if (!flag_q->answer) { if (Vect_open_new(&Out, net_out_opt->answer, 0) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), net_out_opt->answer); Vect_hist_command(&Out); } diff --git a/vector/v.label.sa/labels.c b/vector/v.label.sa/labels.c index b4601630ab6..44612b15008 100644 --- a/vector/v.label.sa/labels.c +++ b/vector/v.label.sa/labels.c @@ -55,7 +55,7 @@ label_t *labels_init(struct params *p, int *n_labels) /* open vector for read only */ if (Vect_open_old(&Map, p->map->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), p->map->answer); + G_fatal_error(_("Unable to open vector map <%s>."), p->map->answer); label_sz = Vect_get_num_primitives(&Map, legal_types); @@ -84,7 +84,7 @@ label_t *labels_init(struct params *p, int *n_labels) /* initialize FT 2 library */ if (FT_Init_FreeType(&library)) - G_fatal_error(_("Unable to initialise FreeType")); + G_fatal_error(_("Unable to initialise FreeType.")); font_cap = find_font_from_freetypecap(p->font->answer); if (font_cap == NULL) G_fatal_error(_("Unable to find font '%s'\n"), p->font->answer); diff --git a/vector/v.label/main.c b/vector/v.label/main.c index 8caa02bff8d..c9ffbfb397f 100644 --- a/vector/v.label/main.c +++ b/vector/v.label/main.c @@ -261,7 +261,7 @@ int main(int argc, char **argv) /* open vector */ if (Vect_open_old(&Map, Vectfile->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), Vectfile->answer); + G_fatal_error(_("Unable to open vector map <%s>."), Vectfile->answer); /* open database */ field = atoi(Fieldopt->answer); diff --git a/vector/v.lidar.correction/main.c b/vector/v.lidar.correction/main.c index b2ce7debb39..a34372bd41e 100644 --- a/vector/v.lidar.correction/main.c +++ b/vector/v.lidar.correction/main.c @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) 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>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); /* Input vector must be 3D */ if (!Vect_is_3d(&In)) @@ -171,7 +171,7 @@ int main(int argc, char *argv[]) dist); } else - G_warning(_("No points in current region!")); + G_warning(_("No points in current region.")); Vect_close(&In); exit(EXIT_SUCCESS); @@ -211,13 +211,13 @@ int main(int argc, char *argv[]) /* Open output vector */ if (0 > Vect_open_new(&Out, out_opt->answer, WITH_Z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); } if (0 > Vect_open_new(&Terrain, out_terrain_opt->answer, WITH_Z)) { Vect_close(&In); Vect_close(&Out); - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); } /* Copy vector Head File */ diff --git a/vector/v.lidar.edgedetection/main.c b/vector/v.lidar.edgedetection/main.c index 10ba86685d6..2937d9420c0 100644 --- a/vector/v.lidar.edgedetection/main.c +++ b/vector/v.lidar.edgedetection/main.c @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) 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>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); /* Input vector must be 3D */ if (!Vect_is_3d(&In)) @@ -196,7 +196,7 @@ int main(int argc, char *argv[]) dist); } else - G_warning(_("No points in current region!")); + G_warning(_("No points in current region.")); Vect_close(&In); exit(EXIT_SUCCESS); @@ -250,7 +250,7 @@ int main(int argc, char *argv[]) Vect_check_input_output_name(in_opt->answer, out_opt->answer, G_FATAL_EXIT); /* Open output vector */ if (0 > Vect_open_new(&Out, out_opt->answer, WITH_Z)) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); /* Copy vector Head File */ Vect_copy_head_data(&In, &Out); diff --git a/vector/v.lidar.growing/main.c b/vector/v.lidar.growing/main.c index e84ddd17747..37a0bb0d58b 100644 --- a/vector/v.lidar.growing/main.c +++ b/vector/v.lidar.growing/main.c @@ -128,11 +128,11 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); /* WITHOUT TOPOLOGY */ if (Vect_open_old(&In, in_opt->answer, mapset) < 1) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); Vect_set_open_level(1); /* WITHOUT TOPOLOGY */ if (Vect_open_old(&First, first_opt->answer, mapset) < 1) - G_fatal_error(_("Unable to open vector map <%s>"), first_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), first_opt->answer); /* Open output vector */ if (0 > Vect_open_new(&Out, out_opt->answer, WITH_Z)) { diff --git a/vector/v.lrs/v.lrs.create/main.c b/vector/v.lrs/v.lrs.create/main.c index 392e3166cac..3fe28ea2de3 100644 --- a/vector/v.lrs/v.lrs.create/main.c +++ b/vector/v.lrs/v.lrs.create/main.c @@ -252,7 +252,7 @@ int main(int argc, char **argv) G_fatal_error(_("Vector map <%s> not found"), in_lines_opt->answer); if (Vect_open_old(&In, in_lines_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), in_lines_opt->answer); /* Open input ipoints */ @@ -261,17 +261,17 @@ int main(int argc, char **argv) G_fatal_error(_("Vector map <%s> not found"), points_opt->answer); if (Vect_open_old(&PMap, points_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), points_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), points_opt->answer); /* Open output lines */ if (Vect_open_new(&Out, out_lines_opt->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), out_lines_opt->answer); /* Open output error map */ if (err_opt->answer) { if (Vect_open_new(&EMap, err_opt->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), err_opt->answer); } @@ -326,7 +326,7 @@ int main(int argc, char **argv) snprintf(buf, sizeof(buf), "drop table %s", table_opt->answer); db_append_string(&rsstmt, buf); if (db_execute_immediate(rsdriver, &rsstmt) != DB_OK) - G_warning(_("Unable to drop table: %s"), buf); + G_warning(_("Unable to drop table: '%s'."), buf); } db_init_string(&rsstmt); snprintf(buf, sizeof(buf), @@ -339,7 +339,7 @@ int main(int argc, char **argv) G_debug(debug, "ref tab SQL: %s", buf); db_append_string(&rsstmt, buf); if (db_execute_immediate(rsdriver, &rsstmt) != DB_OK) - G_fatal_error(_("Unable to create table: %s"), buf); + G_fatal_error(_("Unable to create table: '%s'."), buf); /* Select all lid from line table */ snprintf(buf, sizeof(buf), "select %s from %s", lidcol_opt->answer, diff --git a/vector/v.lrs/v.lrs.label/main.c b/vector/v.lrs/v.lrs.label/main.c index 8a2f1063905..f897a7cc531 100644 --- a/vector/v.lrs/v.lrs.label/main.c +++ b/vector/v.lrs/v.lrs.label/main.c @@ -268,11 +268,11 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&In, in_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); /* Open output segments */ if (Vect_open_new(&Out, out_opt->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); /* open labels */ labels = NULL; diff --git a/vector/v.lrs/v.lrs.segment/main.c b/vector/v.lrs/v.lrs.segment/main.c index b631b5bf831..57e9ad9ec56 100644 --- a/vector/v.lrs/v.lrs.segment/main.c +++ b/vector/v.lrs/v.lrs.segment/main.c @@ -112,7 +112,7 @@ int main(int argc, char **argv) if (file_opt->answer) { /* open input file */ if ((in_file = fopen(file_opt->answer, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), file_opt->answer); } @@ -123,11 +123,11 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&In, in_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); /* Open output segments */ if (Vect_open_new(&Out, out_opt->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); db_init_handle(&rshandle); db_init_string(&rsstmt); @@ -186,7 +186,7 @@ int main(int argc, char **argv) /* OK, write point */ line = find_line(&In, lfield, lcat1); if (line == 0) { - G_warning(_("Unable to find line of cat [%d]"), lcat1); + G_warning(_("Unable to find line of cat %d."), lcat1); break; } @@ -272,7 +272,7 @@ int main(int argc, char **argv) map_offset2); line = find_line(&In, lfield, lcat1); if (line == 0) { - G_warning(_("Unable to find line of cat [%d]"), lcat1); + G_warning(_("Unable to find line of cat %d."), lcat1); break; } diff --git a/vector/v.lrs/v.lrs.where/main.c b/vector/v.lrs/v.lrs.where/main.c index bd2f5846dfe..72508a443e6 100644 --- a/vector/v.lrs/v.lrs.where/main.c +++ b/vector/v.lrs/v.lrs.where/main.c @@ -127,7 +127,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&LMap, lines_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), lines_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), lines_opt->answer); /* Open input points */ mapset = G_find_vector2(points_opt->answer, NULL); @@ -136,7 +136,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&PMap, points_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), points_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), points_opt->answer); db_init_handle(&rshandle); db_init_string(&rsstmt); diff --git a/vector/v.mkgrid/main.c b/vector/v.mkgrid/main.c index 92dcf953166..1b2167806ec 100644 --- a/vector/v.mkgrid/main.c +++ b/vector/v.mkgrid/main.c @@ -275,7 +275,7 @@ int main(int argc, char *argv[]) /* Open output map */ if (0 > Vect_open_new(&Map, dig_file, 0)) { - G_fatal_error(_("Unable to create vector map <%s>"), dig_file); + G_fatal_error(_("Unable to create vector map <%s>."), dig_file); } Vect_hist_command(&Map); @@ -358,7 +358,8 @@ int main(int argc, char *argv[]) G_debug(1, "SQL: %s", db_get_string(&sql)); if (db_execute_immediate(Driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), + db_get_string(&sql)); } if (db_create_index2(Driver, Fi->table, Fi->key) != DB_OK) @@ -382,7 +383,7 @@ int main(int argc, char *argv[]) G_debug(3, "SQL: %s", db_get_string(&sql)); if (db_execute_immediate(Driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to insert new record: %s"), + G_fatal_error(_("Unable to insert new record: '%s'."), db_get_string(&sql)); } } @@ -419,7 +420,8 @@ int main(int argc, char *argv[]) G_debug(1, "SQL: %s", db_get_string(&sql)); if (db_execute_immediate(Driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), + db_get_string(&sql)); } if (db_create_index2(Driver, Fi->table, Fi->key) != DB_OK) @@ -482,7 +484,7 @@ int main(int argc, char *argv[]) G_debug(3, "SQL: %s", db_get_string(&sql)); if (db_execute_immediate(Driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to insert new record: %s"), + G_fatal_error(_("Unable to insert new record: '%s'."), db_get_string(&sql)); } attCount++; diff --git a/vector/v.mkgrid/write_grid.c b/vector/v.mkgrid/write_grid.c index 1fa43b4944a..9a9b6d6db9e 100644 --- a/vector/v.mkgrid/write_grid.c +++ b/vector/v.mkgrid/write_grid.c @@ -25,7 +25,7 @@ int write_vect(double x1, double y1, double x2, double y2, struct Map_info *Map, yarray[1] = y2; if (0 > Vect_copy_xyz_to_pnts(Points, xarray, yarray, NULL, NUM_POINTS)) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); Vect_write_line(Map, out_type, Points, Cats); return 0; diff --git a/vector/v.neighbors/main.c b/vector/v.neighbors/main.c index 5f0ce7ebd49..e0626129b77 100644 --- a/vector/v.neighbors/main.c +++ b/vector/v.neighbors/main.c @@ -200,7 +200,7 @@ int main(int argc, char *argv[]) /* open input vector */ Vect_set_open_level(2); if (Vect_open_old2(&In, in_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); field = Vect_get_field_number(&In, field_opt->answer); pcat_list = NULL; @@ -213,7 +213,7 @@ int main(int argc, char *argv[]) if (strcmp(method_opt->answer, "count") != 0) { Fi = Vect_get_field(&In, field); if (Fi == 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_open_database(Fi->driver, Fi->database); diff --git a/vector/v.net.alloc/main.c b/vector/v.net.alloc/main.c index 2f655c82830..a95b8fb0b9d 100644 --- a/vector/v.net.alloc/main.c +++ b/vector/v.net.alloc/main.c @@ -171,7 +171,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&Map, map->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map->answer); afield = Vect_get_field_number(&Map, afield_opt->answer); nfield = Vect_get_field_number(&Map, nfield_opt->answer); @@ -285,7 +285,7 @@ int main(int argc, char **argv) /* Write arcs to new map */ if (Vect_open_new(&Out, output->answer, Vect_is_3d(&Map)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); Vect_hist_command(&Out); @@ -316,7 +316,7 @@ int main(int argc, char **argv) G_debug(2, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: '%s'"), + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } @@ -325,7 +325,7 @@ int main(int argc, char **argv) if (db_grant_on_table(driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), + G_fatal_error(_("Cannot grant privileges on table <%s>."), Fi->table); db_begin_transaction(driver); @@ -422,7 +422,7 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } ucat++; @@ -455,7 +455,7 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } ucat++; @@ -487,7 +487,7 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } ucat++; @@ -527,7 +527,7 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } ucat++; @@ -556,7 +556,7 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } ucat++; @@ -606,7 +606,8 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: " + "'%s'."), db_get_string(&sql)); } ucat++; @@ -642,7 +643,8 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: " + "'%s'."), db_get_string(&sql)); } ucat++; @@ -673,7 +675,7 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } ucat++; diff --git a/vector/v.net.allpairs/main.c b/vector/v.net.allpairs/main.c index 6f6ed4d2de8..0ddae20bd0b 100644 --- a/vector/v.net.allpairs/main.c +++ b/vector/v.net.allpairs/main.c @@ -122,13 +122,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } if (geo_f->answer) { @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(driver, Fi->table, GV_KEY_COLUMN) != DB_OK) { if (strcmp(Fi->driver, "dbf")) @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) } if (db_grant_on_table(driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), Fi->table); + G_fatal_error(_("Cannot grant privileges on table <%s>."), Fi->table); db_begin_transaction(driver); @@ -193,7 +193,7 @@ int main(int argc, char *argv[]) spnode = (struct _spnode *)G_calloc(nnodes, sizeof(struct _spnode)); if (!spnode) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); for (i = 0; i < nnodes; i++) { spnode[i].cat = -1; @@ -264,7 +264,7 @@ int main(int argc, char *argv[]) if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } diff --git a/vector/v.net.bridge/main.c b/vector/v.net.bridge/main.c index 647cf7f07ef..393d9bc85bd 100644 --- a/vector/v.net.bridge/main.c +++ b/vector/v.net.bridge/main.c @@ -107,13 +107,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } /* parse filter option and select appropriate lines */ diff --git a/vector/v.net.centrality/main.c b/vector/v.net.centrality/main.c index e7a9c8e3961..74c13618cf2 100644 --- a/vector/v.net.centrality/main.c +++ b/vector/v.net.centrality/main.c @@ -61,7 +61,8 @@ void process_node(int node, int cat) db_append_string(&sql, ")"); if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql)); + G_fatal_error(_("Cannot insert new record: '%s'."), + db_get_string(&sql)); } } @@ -201,13 +202,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } if (geo_f->answer) { @@ -257,7 +258,7 @@ int main(int argc, char *argv[]) G_debug(2, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(driver, Fi->table, GV_KEY_COLUMN) != DB_OK) @@ -265,7 +266,7 @@ int main(int argc, char *argv[]) if (db_grant_on_table(driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), Fi->table); + G_fatal_error(_("Cannot grant privileges on table <%s>."), Fi->table); db_begin_transaction(driver); @@ -285,30 +286,30 @@ int main(int argc, char *argv[]) covered = (char *)G_calloc(nnodes + 1, sizeof(char)); if (!covered) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); if (deg_opt->answer) { deg = (double *)G_calloc(nnodes + 1, sizeof(double)); if (!deg) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } if (close_opt->answer) { closeness = (double *)G_calloc(nnodes + 1, sizeof(double)); if (!closeness) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } if (betw_opt->answer) { betw = (double *)G_calloc(nnodes + 1, sizeof(double)); if (!betw) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } if (eigen_opt->answer) { eigen = (double *)G_calloc(nnodes + 1, sizeof(double)); if (!eigen) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } if (deg_opt->answer) { diff --git a/vector/v.net.components/main.c b/vector/v.net.components/main.c index 4f136ee09c4..fa2eb575e62 100644 --- a/vector/v.net.components/main.c +++ b/vector/v.net.components/main.c @@ -32,7 +32,7 @@ int insert_new_record(dbDriver *driver, struct field_info *Fi, dbString *sql, if (db_execute_immediate(driver, sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Cannot insert new record: %s"), db_get_string(sql)); + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(sql)); return 0; }; return 1; @@ -138,13 +138,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } /* parse filter option and select appropriate lines */ @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) component = (int *)G_calloc(nnodes + 1, sizeof(int)); covered = (char *)G_calloc(nnodes + 1, sizeof(char)); if (!component || !covered) { - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); exit(EXIT_FAILURE); } /* Create table */ @@ -182,7 +182,7 @@ int main(int argc, char *argv[]) if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(driver, Fi->table, GV_KEY_COLUMN) != DB_OK) @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) if (db_grant_on_table(driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), Fi->table); + G_fatal_error(_("Cannot grant privileges on table <%s>."), Fi->table); db_begin_transaction(driver); diff --git a/vector/v.net.connectivity/main.c b/vector/v.net.connectivity/main.c index 77696cab6c0..70ff073ad67 100644 --- a/vector/v.net.connectivity/main.c +++ b/vector/v.net.connectivity/main.c @@ -121,13 +121,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } /* parse filter option and select appropriate lines */ @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) if (ncol->answer) { node_costs = (int *)G_calloc(nnodes + 1, sizeof(int)); if (!node_costs) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); NetA_get_node_costs(&In, nfield, ncol->answer, node_costs); nedges = NetA_split_vertices(graph, &vg, node_costs); G_free(node_costs); @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) flow = (int *)G_calloc(nedges + 1, sizeof(int)); if (!flow) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); total_flow = NetA_flow(graph, set1_list, set2_list, flow); G_debug(3, "Connectivity: %d", total_flow); diff --git a/vector/v.net.distance/main.c b/vector/v.net.distance/main.c index 721c7d81d88..d72ef662797 100644 --- a/vector/v.net.distance/main.c +++ b/vector/v.net.distance/main.c @@ -186,13 +186,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } if (geo_f->answer) { @@ -221,7 +221,7 @@ int main(int argc, char *argv[]) segdir = (char *)G_calloc(nlines + 1, sizeof(char)); if (!dst || !nxt || !nodes_to_features || !on_path || !segdir) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); for (i = 1; i <= nlines; i++) { on_path[i] = Vect_new_cats_struct(); @@ -286,7 +286,7 @@ int main(int argc, char *argv[]) G_debug(2, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(driver, Fi->table, GV_KEY_COLUMN) != DB_OK) @@ -294,7 +294,7 @@ int main(int argc, char *argv[]) if (db_grant_on_table(driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), Fi->table); + G_fatal_error(_("Cannot grant privileges on table <%s>."), Fi->table); db_begin_transaction(driver); @@ -360,7 +360,7 @@ int main(int argc, char *argv[]) db_set_string(&sql, buf); G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); }; diff --git a/vector/v.net.flow/main.c b/vector/v.net.flow/main.c index ddad7553032..d8726e45ae4 100644 --- a/vector/v.net.flow/main.c +++ b/vector/v.net.flow/main.c @@ -134,19 +134,19 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } if (find_cut && 0 > Vect_open_new(&cut_map, cut_out->answer, with_z)) { Vect_close(&In); Vect_close(&Out); - G_fatal_error(_("Unable to create vector map <%s>"), cut_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), cut_out->answer); } /* parse filter option and select appropriate lines */ @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(driver, Fi->table, GV_KEY_COLUMN) != DB_OK) @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) if (db_grant_on_table(driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), Fi->table); + G_fatal_error(_("Cannot grant privileges on table <%s>."), Fi->table); db_begin_transaction(driver); @@ -222,7 +222,7 @@ int main(int argc, char *argv[]) nlines = Vect_get_num_lines(&In); flow = (int *)G_calloc(nlines + 1, sizeof(int)); if (!flow) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); total_flow = NetA_flow(graph, source_list, sink_list, flow); G_debug(3, "Max flow: %d", total_flow); @@ -252,7 +252,7 @@ int main(int argc, char *argv[]) if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); }; } diff --git a/vector/v.net.iso/main.c b/vector/v.net.iso/main.c index b8b89b788ac..a4c11c2202d 100644 --- a/vector/v.net.iso/main.c +++ b/vector/v.net.iso/main.c @@ -231,7 +231,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&Map, map->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map->answer); afield = Vect_get_field_number(&Map, afield_opt->answer); nfield = Vect_get_field_number(&Map, nfield_opt->answer); @@ -345,7 +345,7 @@ int main(int argc, char **argv) /* Write arcs to new map */ if (Vect_open_new(&Out, output->answer, Vect_is_3d(&Map)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); Vect_hist_command(&Out); @@ -380,7 +380,7 @@ int main(int argc, char **argv) G_debug(2, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: '%s'"), + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } @@ -389,7 +389,7 @@ int main(int argc, char **argv) if (db_grant_on_table(driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), + G_fatal_error(_("Cannot grant privileges on table <%s>."), Fi->table); db_begin_transaction(driver); @@ -715,7 +715,7 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } ucat++; @@ -745,7 +745,7 @@ int main(int argc, char **argv) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } ucat++; diff --git a/vector/v.net.path/main.c b/vector/v.net.path/main.c index 01c19bc8a65..39057ecd76e 100644 --- a/vector/v.net.path/main.c +++ b/vector/v.net.path/main.c @@ -150,7 +150,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&In, input_opt->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), input_opt->answer); afield = Vect_get_field_number(&In, afield_opt->answer); nfield = Vect_get_field_number(&In, nfield_opt->answer); @@ -159,7 +159,7 @@ int main(int argc, char **argv) if (1 > Vect_open_new(&Out, output_opt->answer, Vect_is_3d(&In))) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), output_opt->answer); } Vect_hist_command(&Out); diff --git a/vector/v.net.path/path.c b/vector/v.net.path/path.c index d59cd718dbb..eb224477220 100644 --- a/vector/v.net.path/path.c +++ b/vector/v.net.path/path.c @@ -45,7 +45,7 @@ int path(struct Map_info *In, struct Map_info *Out, char *filename, int nfield, if (filename) { /* open input file */ if ((in_file = fopen(filename, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), filename); + G_fatal_error(_("Unable to open input file '%s'."), filename); } AList = Vect_new_list(); @@ -107,7 +107,7 @@ int path(struct Map_info *In, struct Map_info *Out, char *filename, int nfield, G_debug(2, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(driver, Fi->table, GV_KEY_COLUMN) != DB_OK) @@ -115,7 +115,7 @@ int path(struct Map_info *In, struct Map_info *Out, char *filename, int nfield, if (db_grant_on_table(driver, Fi->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), Fi->table); + G_fatal_error(_("Cannot grant privileges on table <%s>."), Fi->table); db_begin_transaction(driver); @@ -334,7 +334,7 @@ int path(struct Map_info *In, struct Map_info *Out, char *filename, int nfield, G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: %s"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } } diff --git a/vector/v.net.salesman/main.c b/vector/v.net.salesman/main.c index 21a3d9ac769..a6460a9525e 100644 --- a/vector/v.net.salesman/main.c +++ b/vector/v.net.salesman/main.c @@ -244,7 +244,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&Map, map->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map->answer); afield = Vect_get_field_number(&Map, afield_opt->answer); nfield = Vect_get_field_number(&Map, nfield_opt->answer); @@ -538,7 +538,7 @@ int main(int argc, char **argv) /* Write arcs to new map */ if (Vect_open_new(&Out, output->answer, Vect_is_3d(&Map)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); Vect_hist_command(&Out); @@ -567,7 +567,7 @@ int main(int argc, char **argv) fp = fopen(seqname, "w"); if (!fp) - G_fatal_error(_("Unable to open file '%s' for writing"), seqname); + G_fatal_error(_("Unable to open file '%s' for writing."), seqname); fprintf(fp, "sequence;category;cost_to_next\n"); } diff --git a/vector/v.net.spanningtree/main.c b/vector/v.net.spanningtree/main.c index 40b62158657..1c1cec32d3d 100644 --- a/vector/v.net.spanningtree/main.c +++ b/vector/v.net.spanningtree/main.c @@ -92,13 +92,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } if (geo_f->answer) { diff --git a/vector/v.net.steiner/main.c b/vector/v.net.steiner/main.c index 4420ca3646f..a56eba7e1ec 100644 --- a/vector/v.net.steiner/main.c +++ b/vector/v.net.steiner/main.c @@ -433,7 +433,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old(&Map, map->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map->answer); nnodes = Vect_get_num_nodes(&Map); nlines = Vect_get_num_lines(&Map); @@ -615,7 +615,7 @@ int main(int argc, char **argv) /* Write arcs to new map */ if (Vect_open_new(&Out, output->answer, Vect_is_3d(&Map)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); Vect_hist_command(&Out); diff --git a/vector/v.net.timetable/main.c b/vector/v.net.timetable/main.c index 03011ad01fa..8c9af03d607 100644 --- a/vector/v.net.timetable/main.c +++ b/vector/v.net.timetable/main.c @@ -92,7 +92,7 @@ void init_database(struct Map_info *Out, dbDriver **driver, if (db_execute_immediate(*driver, &sql) != DB_OK) { db_close_database_shutdown_driver(*driver); - G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&sql)); } if (db_create_index2(*driver, (*Fi)->table, GV_KEY_COLUMN) != DB_OK) @@ -100,7 +100,8 @@ void init_database(struct Map_info *Out, dbDriver **driver, if (db_grant_on_table(*driver, (*Fi)->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK) - G_fatal_error(_("Cannot grant privileges on table <%s>"), (*Fi)->table); + G_fatal_error(_("Cannot grant privileges on table <%s>."), + (*Fi)->table); db_free_string(&sql); db_begin_transaction(*driver); @@ -120,7 +121,8 @@ void insert_point(dbDriver *driver, char *table, int cat, int path, int stop_id, G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql)); + G_fatal_error(_("Cannot insert new record: '%s'."), + db_get_string(&sql)); }; db_free_string(&sql); @@ -141,7 +143,8 @@ void insert_line(dbDriver *driver, char *table, int cat, int path, int from_id, G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { db_close_database_shutdown_driver(driver); - G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql)); + G_fatal_error(_("Cannot insert new record: '%s'."), + db_get_string(&sql)); }; db_free_string(&sql); @@ -339,13 +342,13 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (1 > Vect_open_old(&In, map_in->answer, "")) - G_fatal_error(_("Unable to open vector map <%s>"), map_in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_in->answer); with_z = Vect_is_3d(&In); if (0 > Vect_open_new(&Out, map_out->answer, with_z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), map_out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), map_out->answer); } /* parse filter option and select appropriate lines */ @@ -377,7 +380,7 @@ int main(int argc, char *argv[]) found = (int *)G_calloc(timetable.stops, sizeof(int)); if (!stop_x || !stop_y || !stop_z || !found) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); if (afield > 0) { nnodes = Vect_get_num_nodes(&In); @@ -386,7 +389,7 @@ int main(int argc, char *argv[]) (struct ilist **)G_calloc(timetable.routes, sizeof(struct ilist *)); edges = (int *)G_calloc(nnodes + 1, sizeof(int)); if (!edges || !stop_node || !lines) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); for (i = 0; i < timetable.routes; i++) lines[i] = Vect_new_list(); diff --git a/vector/v.net.visibility/main.c b/vector/v.net.visibility/main.c index 3022660d2da..b51ef850e8c 100644 --- a/vector/v.net.visibility/main.c +++ b/vector/v.net.visibility/main.c @@ -63,16 +63,16 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old(&in, input->answer, "") < 1) /* opens the map */ - G_fatal_error(_("Unable to open vector map <%s>"), input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), input->answer); if (Vect_open_new(&out, output->answer, WITHOUT_Z) < 0) { Vect_close(&in); - G_fatal_error(_("Unable to create vector map <%s>"), output->answer); + G_fatal_error(_("Unable to create vector map <%s>."), output->answer); } if (ovis->answer != NULL) { if (Vect_open_old(&vis, ovis->answer, "") < 1) - G_fatal_error(_("Unable to open vector map <%s>"), ovis->answer); + G_fatal_error(_("Unable to open vector map <%s>."), ovis->answer); if (Vect_copy_map_lines(&vis, &out) > 0) G_fatal_error(_("Unable to copy elements from vector map <%s>"), diff --git a/vector/v.net/main.c b/vector/v.net/main.c index d7f86fe4c47..bb5e67ed5d6 100644 --- a/vector/v.net/main.c +++ b/vector/v.net/main.c @@ -60,7 +60,7 @@ int main(int argc, char **argv) In = (struct Map_info *)G_malloc(sizeof(struct Map_info)); Vect_set_open_level(2); if (Vect_open_old(In, opt.input->answer, "") == -1) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), opt.input->answer); } @@ -84,7 +84,7 @@ int main(int argc, char **argv) if (Vect_open_old(Points, opt.points->answer, "") == -1) { if (In) Vect_close(In); - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), opt.points->answer); } @@ -92,7 +92,7 @@ int main(int argc, char **argv) /* open input file */ if (strcmp(opt.file->answer, "-")) { if ((file_arcs = fopen(opt.file->answer, "r")) == NULL) { - G_fatal_error(_("Unable to open file <%s>"), + G_fatal_error(_("Unable to open file '%s'."), opt.file->answer); } } @@ -105,7 +105,7 @@ int main(int argc, char **argv) /* create output map */ Out = (struct Map_info *)G_malloc(sizeof(struct Map_info)); if (!Out) - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); is3d = WITHOUT_Z; if (In) is3d = Vect_is_3d(In); diff --git a/vector/v.normal/main.c b/vector/v.normal/main.c index 3920e6d5a7c..06f374a6366 100644 --- a/vector/v.normal/main.c +++ b/vector/v.normal/main.c @@ -102,7 +102,7 @@ int main(int argc, char **argv) /* Open input */ Vect_set_open_level(2); if (Vect_open_old2(&Map, parm.input->answer, "", parm.layer->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), parm.input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), parm.input->answer); field = Vect_get_field_number(&Map, parm.layer->answer); diff --git a/vector/v.out.ascii/main.c b/vector/v.out.ascii/main.c index aaaad13de13..8d5d56eb336 100644 --- a/vector/v.out.ascii/main.c +++ b/vector/v.out.ascii/main.c @@ -86,14 +86,14 @@ int main(int argc, char *argv[]) else { Vect_set_open_level(1); /* topology not needed */ if (Vect_open_old2(&Map, input, "", field_name) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input); + G_fatal_error(_("Unable to open vector map <%s>."), input); if (Vect_maptype(&Map) != GV_FORMAT_NATIVE) { /* require topological level for external formats centroids are read from topo */ Vect_close(&Map); Vect_set_open_level(2); if (Vect_open_old2(&Map, input, "", field_name) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input); + G_fatal_error(_("Unable to open vector map <%s>."), input); } } @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) } if (ascii == NULL) { - G_fatal_error(_("Unable to open file <%s>"), output); + G_fatal_error(_("Unable to open file '%s'."), output); } } else { diff --git a/vector/v.out.dxf/main.c b/vector/v.out.dxf/main.c index e3031869d3a..ca0b26485fd 100644 --- a/vector/v.out.dxf/main.c +++ b/vector/v.out.dxf/main.c @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&In, input->answer, "", field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), input->answer); dxf_open(dxf_file); /* open output */ diff --git a/vector/v.out.dxf/write_dxf.c b/vector/v.out.dxf/write_dxf.c index eab79804ce3..041dc0fe60e 100644 --- a/vector/v.out.dxf/write_dxf.c +++ b/vector/v.out.dxf/write_dxf.c @@ -18,9 +18,9 @@ int dxf_open(char *filename) fclose(dxf_fp); if (!overwrite) - G_fatal_error(_("The file '%s' already exists."), filename); + G_fatal_error(_("File '%s' already exists."), filename); - G_warning(_("The file '%s' already exists and will be overwritten."), + G_warning(_("File '%s' already exists and will be overwritten."), filename); } if ((dxf_fp = fopen(filename, "w")) == NULL) diff --git a/vector/v.out.lidar/main.c b/vector/v.out.lidar/main.c index f60e5377d5f..5bdd43b3e0b 100644 --- a/vector/v.out.lidar/main.c +++ b/vector/v.out.lidar/main.c @@ -68,7 +68,7 @@ static void open_database(struct Map_info *vector, int field, dbDriver **driver, if (f_info_tmp == NULL) { /* not ideal message since we don't know the original name of * the field in case of OGR */ - G_fatal_error(_("Database connection not defined for layer <%d>"), + G_fatal_error(_("Database connection not defined for layer %d."), field); } @@ -465,8 +465,8 @@ int main(int argc, char **argv) G_add_keyword(_("LIDAR")); G_add_keyword(_("points")); module->label = _("Exports vector points as LAS point cloud"); - module->description = _("Converts LAS LiDAR point clouds to a GRASS" - " vector map with libLAS"); + module->description = _("Converts LAS LiDAR point clouds to a GRASS " + "vector map with libLAS."); map_opt = G_define_standard_option(G_OPT_V_INPUT); @@ -600,7 +600,7 @@ int main(int argc, char **argv) */ if (Vect_open_old2(&vinput, map_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_opt->answer); int layer = Vect_get_field_number(&vinput, field_opt->answer); struct cat_list *allowed_cats = NULL; diff --git a/vector/v.out.ogr/main.c b/vector/v.out.ogr/main.c index baf6f1cdbf3..f48c5a8ce4c 100644 --- a/vector/v.out.ogr/main.c +++ b/vector/v.out.ogr/main.c @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&In, options.input->answer, "", options.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), options.input->answer); if (strcmp(options.type->answer, "auto") == 0) { diff --git a/vector/v.out.postgis/args.c b/vector/v.out.postgis/args.c index 08ec5954561..473943931e2 100644 --- a/vector/v.out.postgis/args.c +++ b/vector/v.out.postgis/args.c @@ -74,7 +74,7 @@ void define_options(struct params *params, struct flags *flags) flags->force2d = G_define_flag(); flags->force2d->key = '2'; - flags->force2d->label = _("Force 2D output even if input is 3D "); + flags->force2d->label = _("Force 2D output even if input is 3D"); flags->force2d->description = _("Useful if input is 3D but all z coordinates are identical"); flags->force2d->guisection = _("Creation"); diff --git a/vector/v.out.postgis/main.c b/vector/v.out.postgis/main.c index f9a34c309b8..2cc5e9f8ed9 100644 --- a/vector/v.out.postgis/main.c +++ b/vector/v.out.postgis/main.c @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) /* open input for reading */ ret = Vect_open_old2(&In, params.input->answer, "", params.layer->answer); if (ret == -1) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), params.input->answer); if (Vect_maptype(&In) != GV_FORMAT_NATIVE) G_fatal_error( diff --git a/vector/v.out.pov/main.c b/vector/v.out.pov/main.c index f5ab9f1abdf..668c29218d7 100644 --- a/vector/v.out.pov/main.c +++ b/vector/v.out.pov/main.c @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) /* open input vector */ Vect_set_open_level(2); if (Vect_open_old2(&In, in_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); field = Vect_get_field_number(&In, field_opt->answer); diff --git a/vector/v.out.svg/main.c b/vector/v.out.svg/main.c index 70b488db80d..7b83c9a33fb 100644 --- a/vector/v.out.svg/main.c +++ b/vector/v.out.svg/main.c @@ -133,7 +133,7 @@ int main(int argc, char *argv[]) /* open input vector */ Vect_set_open_level(2); if (Vect_open_old2(&In, in_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); /* parse field number */ field = Vect_get_field_number(&In, field_opt->answer); diff --git a/vector/v.out.vtk/main.c b/vector/v.out.vtk/main.c index 57580286675..fd94e124fa7 100644 --- a/vector/v.out.vtk/main.c +++ b/vector/v.out.vtk/main.c @@ -166,7 +166,7 @@ int main(int argc, char *argv[]) if (output->answer) { ascii = fopen(output->answer, "w"); if (ascii == NULL) { - G_fatal_error(_("Unable to open file <%s>"), output->answer); + G_fatal_error(_("Unable to open file '%s'."), output->answer); } } else { diff --git a/vector/v.outlier/main.c b/vector/v.outlier/main.c index 3ebf24a8deb..38fdeb4a8f2 100644 --- a/vector/v.outlier/main.c +++ b/vector/v.outlier/main.c @@ -216,7 +216,7 @@ int main(int argc, char *argv[]) G_message("Estimated mean distance between points: %.4g", dist); } else - G_warning(_("No points in current region!")); + G_warning(_("No points in current region.")); Vect_close(&In); exit(EXIT_SUCCESS); @@ -225,18 +225,18 @@ int main(int argc, char *argv[]) /* Open output vector */ if (qgis_opt->answer) if (0 > Vect_open_new(&Qgis, qgis_opt->answer, WITHOUT_Z)) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), qgis_opt->answer); if (0 > Vect_open_new(&Out, out_opt->answer, WITH_Z)) { Vect_close(&Qgis); - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); } if (0 > Vect_open_new(&Outlier, outlier_opt->answer, WITH_Z)) { Vect_close(&Out); Vect_close(&Qgis); - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); } /* Copy vector Head File */ diff --git a/vector/v.overlay/area_area.c b/vector/v.overlay/area_area.c index b98f249fadb..bf2acf5fe98 100644 --- a/vector/v.overlay/area_area.c +++ b/vector/v.overlay/area_area.c @@ -445,7 +445,7 @@ int area_area(struct Map_info *In, int *field, struct Map_info *Tmp, G_debug(3, "%s", db_get_string(&stmt)); if (db_execute_immediate(driver, &stmt) != DB_OK) - G_warning(_("Unable to insert new record: '%s'"), + G_warning(_("Unable to insert new record: '%s'."), db_get_string(&stmt)); } out_cat++; diff --git a/vector/v.overlay/line_area.c b/vector/v.overlay/line_area.c index e8a65d6fcc2..af03c2d9742 100644 --- a/vector/v.overlay/line_area.c +++ b/vector/v.overlay/line_area.c @@ -449,7 +449,7 @@ int line_area(struct Map_info *In, int *field, struct Map_info *Tmp, if (db_execute_immediate(driver, &stmt) != DB_OK) G_warning( - _("Unable to insert new record: '%s'"), + _("Unable to insert new record: '%s'."), db_get_string(&stmt)); } diff --git a/vector/v.overlay/main.c b/vector/v.overlay/main.c index 80cbf58c2db..8ee3ec80447 100644 --- a/vector/v.overlay/main.c +++ b/vector/v.overlay/main.c @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&(In[input]), in_opt[input]->answer, "", field_opt[input]->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), in_opt[input]->answer); field[input] = Vect_get_field_number(&(In[input]), field_opt[input]->answer); @@ -232,7 +232,7 @@ int main(int argc, char *argv[]) /* Open output */ if (Vect_open_new(&Out, out_opt->answer, WITHOUT_Z) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_set_map_name(&Out, "Output from v.overlay"); Vect_set_person(&Out, G_whoami()); @@ -424,7 +424,7 @@ int main(int argc, char *argv[]) inFi = Vect_get_field(&(In[input]), field[input]); if (!inFi) { - G_warning(_("Database connection not defined for layer %d"), + G_warning(_("Database connection not defined for layer %d."), field[input]); continue; } @@ -618,7 +618,7 @@ int main(int argc, char *argv[]) if (db_execute_immediate(driver, &stmt) != DB_OK) { Vect_close(&Out); db_close_database_shutdown_driver(driver); - G_fatal_error(_("Unable to create table: '%s'"), + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&stmt)); } diff --git a/vector/v.parallel/main.c b/vector/v.parallel/main.c index c62f2941827..50791e85f7f 100644 --- a/vector/v.parallel/main.c +++ b/vector/v.parallel/main.c @@ -140,12 +140,12 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&In, in_opt->answer, "", layer_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); layer = Vect_get_field_number(&In, layer_opt->answer); if (Vect_open_new(&Out, out_opt->answer, 0) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_copy_head_data(&In, &Out); Vect_hist_copy(&In, &Out); diff --git a/vector/v.patch/main.c b/vector/v.patch/main.c index a8b02bc15c9..63f9c0bea63 100644 --- a/vector/v.patch/main.c +++ b/vector/v.patch/main.c @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(no_input_topo_flag->answer ? 1 : 2); if (Vect_open_old_head(&InMap, in_name, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_name); + G_fatal_error(_("Unable to open vector map <%s>."), in_name); if (out_is_3d != WITH_Z && Vect_is_3d(&InMap)) out_is_3d = WITH_Z; @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) if (append->answer) { Vect_set_open_level(1); if (Vect_open_old_head(&OutMap, out_name, G_mapset()) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), out_name); + G_fatal_error(_("Unable to open vector map <%s>."), out_name); fi_out = Vect_get_field(&OutMap, 1); if (fi_out) { @@ -182,7 +182,7 @@ int main(int argc, char *argv[]) in_name = old->answers[i]; Vect_set_open_level(1); if (Vect_open_old_head(&InMap, in_name, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_name); + G_fatal_error(_("Unable to open vector map <%s>."), in_name); fi_in = Vect_get_field(&InMap, 1); table_in = NULL; @@ -333,7 +333,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); if (Vect_open_update(&OutMap, out_name, G_mapset()) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), out_name); + G_fatal_error(_("Unable to open vector map <%s>."), out_name); if (out_is_3d == WITH_Z && !Vect_is_3d(&OutMap)) { G_warning(_("The output map is not 3D")); @@ -342,12 +342,12 @@ int main(int argc, char *argv[]) } else { if (Vect_open_new(&OutMap, out_name, out_is_3d) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_name); + G_fatal_error(_("Unable to create vector map <%s>."), out_name); } if (bbox_name) { if (Vect_open_new(&BBoxMap, bbox_name, out_is_3d) < 0) /* TODO 3D */ - G_fatal_error(_("Unable to create vector map <%s>"), bbox_name); + G_fatal_error(_("Unable to create vector map <%s>."), bbox_name); Vect_hist_command(&BBoxMap); } @@ -379,7 +379,7 @@ int main(int argc, char *argv[]) if (!append->answer) { if (db_create_table(driver_out, table_out) != DB_OK) { - G_fatal_error(_("Unable to create table <%s>"), fi_out->table); + G_fatal_error(_("Unable to create table <%s>."), fi_out->table); } /* do not allow duplicate keys */ @@ -411,7 +411,7 @@ int main(int argc, char *argv[]) else Vect_set_open_level(1); if (Vect_open_old(&InMap, in_name, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_name); + G_fatal_error(_("Unable to open vector map <%s>."), in_name); /*first time around, copy first in head to out head */ if (i == 1) @@ -702,7 +702,7 @@ int copy_records(dbDriver *driver_in, dbString *table_name_in, G_debug(2, "SQL: %s", db_get_string(&sql)); if (db_execute_immediate(driver_out, &sql) != DB_OK) { - G_fatal_error(_("Cannot insert new record: '%s'"), + G_fatal_error(_("Cannot insert new record: '%s'."), db_get_string(&sql)); } } diff --git a/vector/v.perturb/main.c b/vector/v.perturb/main.c index 38b66e985cb..4bdd7f565e0 100644 --- a/vector/v.perturb/main.c +++ b/vector/v.perturb/main.c @@ -154,7 +154,7 @@ int main(int argc, char **argv) /* Open input */ Vect_set_open_level(2); if (Vect_open_old_head2(&In, parm.in->answer, "", parm.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), parm.in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), parm.in->answer); field = Vect_get_field_number(&In, parm.field->answer); @@ -164,7 +164,7 @@ int main(int argc, char **argv) /* Open output */ if (Vect_open_new(&Out, parm.out->answer, out_is_3d) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), parm.out->answer); + G_fatal_error(_("Unable to create vector map <%s>."), parm.out->answer); /* TODO: Add also optional z perturb support */ Vect_hist_copy(&In, &Out); @@ -184,7 +184,7 @@ int main(int argc, char **argv) Vect_close(&In); Vect_set_open_level(1); if (Vect_open_old2(&In, parm.in->answer, "", parm.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), parm.in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), parm.in->answer); i = 0; line = 0; diff --git a/vector/v.ppa/main.c b/vector/v.ppa/main.c index edcfb1aa9a2..428c73ed5d2 100644 --- a/vector/v.ppa/main.c +++ b/vector/v.ppa/main.c @@ -162,11 +162,11 @@ int main(int argc, char *argv[]) num_distances = atoi(num_distances_opt->answer); if (num_distances < 1) - G_fatal_error(_("Option <%s> must be positive"), + G_fatal_error(_("Option <%s> must be positive."), num_distances_opt->key); num_random_points = atoi(random_points_opt->answer); if (num_random_points < 1) - G_fatal_error(_("Option <%s> must be positive"), + G_fatal_error(_("Option <%s> must be positive."), random_points_opt->key); if (seed_opt->answer) { @@ -196,7 +196,7 @@ int main(int argc, char *argv[]) if (max_distance_opt->answer) { max_distance = atof(max_distance_opt->answer); if (max_distance <= 0) - G_fatal_error(_("Option <%s> must be positive"), + G_fatal_error(_("Option <%s> must be positive."), max_distance_opt->key); if (max_distance > 0.5 * shorter_side) G_warning(_("Option <%s> is larger than half of the shorter " @@ -206,7 +206,7 @@ int main(int argc, char *argv[]) } if (Vect_open_old(&map, input_opt->answer, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), input_opt->answer); line_points = Vect_new_line_struct(); line_cats = Vect_new_cats_struct(); diff --git a/vector/v.profile/main.c b/vector/v.profile/main.c index 0e4fb8a9d33..b92a7d0ad86 100644 --- a/vector/v.profile/main.c +++ b/vector/v.profile/main.c @@ -364,7 +364,7 @@ int main(int argc, char *argv[]) } if (ascii == NULL) { - G_fatal_error(_("Unable to open file <%s>"), file_opt->answer); + G_fatal_error(_("Unable to open file '%s'."), file_opt->answer); } } else { @@ -406,7 +406,7 @@ int main(int argc, char *argv[]) /* Open existing vector map for reading */ if (Vect_open_old(&In, old_map->answer, mapset) < 1) - G_fatal_error(_("Unable to open vector map <%s>"), old_map->answer); + G_fatal_error(_("Unable to open vector map <%s>."), old_map->answer); /* Process input as 3D only if it's required */ if (!no_z_flag->answer && Vect_is_3d(&In)) @@ -434,7 +434,7 @@ int main(int argc, char *argv[]) if (inline_map->answer != NULL) { /* If we get here, pro_mapset is initialized */ if (1 > Vect_open_old(&Pro, inline_map->answer, pro_mapset)) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), inline_map->answer); if (inline_where->answer != NULL) { Fpro = Vect_get_field(&Pro, pro_layer); @@ -588,7 +588,7 @@ int main(int argc, char *argv[]) /* Open new vector for reading/writing */ if (0 > Vect_open_new(&Out, new_map->answer, WITHOUT_Z)) { Vect_close(&In); - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), new_map->answer); } diff --git a/vector/v.profile/processors.c b/vector/v.profile/processors.c index e55e78994f5..1f2028ff818 100644 --- a/vector/v.profile/processors.c +++ b/vector/v.profile/processors.c @@ -27,7 +27,7 @@ void add_point(const int cat, const double dist, const double z, /* Don't leak memory if realloc fails */ if (!tmp) { G_free(resultset); - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } else resultset = tmp; diff --git a/vector/v.proj/main.c b/vector/v.proj/main.c index 5bbb03bd184..81a67f20b7f 100644 --- a/vector/v.proj/main.c +++ b/vector/v.proj/main.c @@ -278,7 +278,7 @@ int main(int argc, char *argv[]) G_debug(1, "Open old: location: %s mapset : %s", G_location_path(), G_mapset()); if (Vect_open_old(&Map, map_name, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map_name); + G_fatal_error(_("Unable to open vector map <%s>."), map_name); /* need to set the region to the input vector * for PROJ to select the appropriate pipeline */ @@ -480,7 +480,7 @@ int main(int argc, char *argv[]) G_mapset()); if (Vect_open_new(&Out_Map, omap_name, Vect_is_3d(&Map)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), omap_name); + G_fatal_error(_("Unable to create vector map <%s>."), omap_name); Vect_set_error_handler_io( NULL, &Out_Map); /* register standard i/o error handler */ diff --git a/vector/v.qcount/main.c b/vector/v.qcount/main.c index 511b79f5179..9d7206f842c 100644 --- a/vector/v.qcount/main.c +++ b/vector/v.qcount/main.c @@ -95,7 +95,7 @@ int main(int argc, char **argv) /* Open input */ Vect_set_open_level(2); if (Vect_open_old2(&Map, parm.input->answer, "", parm.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), parm.input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), parm.input->answer); /* Get the quadrats */ G_message(_("Finding quadrats...")); @@ -121,7 +121,7 @@ int main(int argc, char **argv) Cats = Vect_new_cats_struct(); if (Vect_open_new(&Out, parm.output->answer, 0) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), parm.output->answer); Vect_hist_command(&Out); diff --git a/vector/v.random/main.c b/vector/v.random/main.c index bc719c6ff50..a8d43070a97 100644 --- a/vector/v.random/main.c +++ b/vector/v.random/main.c @@ -196,7 +196,7 @@ int main(int argc, char *argv[]) if (parm.input->answer) { Vect_set_open_level(2); /* topology required */ if (2 > Vect_open_old2(&In, parm.input->answer, "", parm.field->answer)) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), parm.input->answer); if (parm.field->answer) @@ -221,7 +221,7 @@ int main(int argc, char *argv[]) /* create new vector map */ if (-1 == Vect_open_new(&Out, output, flag.z->answer ? WITH_Z : WITHOUT_Z)) - G_fatal_error(_("Unable to create vector map <%s>"), output); + G_fatal_error(_("Unable to create vector map <%s>."), output); Vect_set_error_handler_io(NULL, &Out); /* Do we need to write random values into attribute table? */ @@ -262,7 +262,7 @@ int main(int argc, char *argv[]) Fi_input = Vect_get_field2(&In, parm.field->answer); if (Fi_input == NULL) G_fatal_error( - _("Database connection not defined for layer <%s>"), + _("Database connection not defined for layer <%s>."), parm.field->answer); driver_input = db_start_driver_open_database( Fi_input->driver, Vect_subst_var(Fi_input->database, &In)); @@ -291,7 +291,8 @@ int main(int argc, char *argv[]) db_append_string(&sql, ")"); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table: '%s'."), + db_get_string(&sql)); } /* Create index */ @@ -547,7 +548,7 @@ int main(int argc, char *argv[]) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to insert new row: %s"), + G_fatal_error(_("Unable to insert new row: '%s'."), db_get_string(&sql)); } } @@ -703,7 +704,7 @@ int main(int argc, char *argv[]) G_debug(3, "%s", db_get_string(&sql)); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to insert new row: %s"), + G_fatal_error(_("Unable to insert new row: '%s'."), db_get_string(&sql)); } } diff --git a/vector/v.reclass/main.c b/vector/v.reclass/main.c index 6f12bda366a..0825b74838a 100644 --- a/vector/v.reclass/main.c +++ b/vector/v.reclass/main.c @@ -107,11 +107,11 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&In, in_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); field = Vect_get_field_number(&In, field_opt->answer); if (Vect_open_new(&Out, out_opt->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_copy_head_data(&In, &Out); Vect_hist_copy(&In, &Out); @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) Fi = Vect_get_field(&In, field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %s"), + G_fatal_error(_("Database connection not defined for layer <%s>."), field_opt->answer); Driver = db_start_driver_open_database(Fi->driver, Fi->database); @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) G_debug(3, " %d rows selected", nrows); if (nrows <= 0) - G_fatal_error(_("No records selected from table <%s>"), + G_fatal_error(_("No records selected from table <%s>."), Fi->table); db_CatValArray_alloc(&cvarr, nrows); diff --git a/vector/v.rectify/main.c b/vector/v.rectify/main.c index 535d87ea82c..cda61c3a1a7 100644 --- a/vector/v.rectify/main.c +++ b/vector/v.rectify/main.c @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); if (Vect_open_old2(&In, in_opt->answer, "", "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); use3d = (Vect_is_3d(&In) && (flag_use3d->answer || ortho->answer)); @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) if (strcmp(rfile->answer, "-")) { fp = fopen(rfile->answer, "w"); if (!fp) - G_fatal_error(_("Unable to open file '%s' for writing"), + G_fatal_error(_("Unable to open file '%s' for writing."), rfile->answer); } else @@ -199,8 +199,7 @@ int main(int argc, char *argv[]) select_target_env(); if (G_find_vector2(out_opt->answer, G_mapset())) { - G_warning(_("The vector map <%s> already exists."), - out_opt->answer); + G_warning(_("Vector map <%s> already exists."), out_opt->answer); G_warning(_("Target project: <%s>"), G_location()); G_warning(_("Target mapset: <%s>"), G_mapset()); G_fatal_error(_("Rectification cancelled.")); @@ -213,7 +212,7 @@ int main(int argc, char *argv[]) select_target_env(); if (Vect_open_new(&Out, out_opt->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_copy_head_data(&In, &Out); Vect_hist_copy(&In, &Out); diff --git a/vector/v.sample/main.c b/vector/v.sample/main.c index 86f433d93d9..9a8b5ee663e 100644 --- a/vector/v.sample/main.c +++ b/vector/v.sample/main.c @@ -114,7 +114,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old2(&In, parm.input->answer, "", parm.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), parm.input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), parm.input->answer); field = Vect_get_field_number(&In, parm.field->answer); @@ -123,7 +123,7 @@ int main(int argc, char **argv) /* Read attributes */ Fi = Vect_get_field(&In, field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %s"), + G_fatal_error(_("Database connection not defined for layer <%s>."), parm.field->answer); Driver = db_start_driver_open_database(Fi->driver, Fi->database); @@ -153,7 +153,7 @@ int main(int argc, char **argv) /* Open output */ if (Vect_open_new(&Out, parm.output->answer, 0) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), parm.output->answer); Vect_hist_copy(&In, &Out); @@ -183,7 +183,7 @@ int main(int argc, char **argv) db_set_string(&sql, buf); if (db_execute_immediate(Driver, &sql) != DB_OK) - G_fatal_error(_("Unable to create table <%s>"), db_get_string(&sql)); + G_fatal_error(_("Unable to create table <%s>."), db_get_string(&sql)); if (db_create_index2(Driver, Fi->table, Fi->key) != DB_OK) G_warning(_("Cannot create index")); @@ -255,7 +255,8 @@ int main(int argc, char **argv) db_set_string(&sql, buf); if (db_execute_immediate(Driver, &sql) != DB_OK) - G_fatal_error(_("Unable to insert row: %s"), db_get_string(&sql)); + G_fatal_error(_("Unable to insert new row: '%s'."), + db_get_string(&sql)); Vect_write_line(&Out, GV_POINT, Points, Cats); } diff --git a/vector/v.segment/main.c b/vector/v.segment/main.c index fb8fbb4509f..360bb0e793d 100644 --- a/vector/v.segment/main.c +++ b/vector/v.segment/main.c @@ -91,7 +91,7 @@ int main(int argc, char **argv) if (file_opt->answer && strcmp(file_opt->answer, "-") != 0) { /* open input file */ if ((in_file = fopen(file_opt->answer, "r")) == NULL) - G_fatal_error(_("Unable to open input file <%s>"), + G_fatal_error(_("Unable to open input file '%s'."), file_opt->answer); } else @@ -101,13 +101,13 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old2(&In, in_opt->answer, "", lfield_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); lfield = Vect_get_field_number(&In, lfield_opt->answer); /* Open output segments */ if (Vect_open_new(&Out, out_opt->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_hist_copy(&In, &Out); Vect_hist_command(&Out); @@ -149,7 +149,7 @@ int main(int argc, char **argv) /* OK, write point */ line = find_line(&In, lfield, lcat); if (line == 0) { - G_warning(_("Unable to find line of cat %d"), lcat); + G_warning(_("Unable to find line of cat %d."), lcat); break; } @@ -192,7 +192,7 @@ int main(int argc, char **argv) line = find_line(&In, lfield, lcat); if (line == 0) { - G_warning(_("Unable to find line of cat %d"), lcat); + G_warning(_("Unable to find line of cat %d."), lcat); break; } diff --git a/vector/v.select/main.c b/vector/v.select/main.c index 09eff2c81dd..8d20b260226 100644 --- a/vector/v.select/main.c +++ b/vector/v.select/main.c @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) if (Vect_open_old2(&(In[iopt]), parm.input[iopt]->answer, "", parm.field[iopt]->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), + G_fatal_error(_("Unable to open vector map <%s>."), parm.input[iopt]->answer); ifield[iopt] = @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) /* Open output */ if (Vect_open_new(&Out, parm.output->answer, Vect_is_3d(&(In[0]))) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), parm.output->answer); Vect_set_map_name(&Out, _("Output from v.select")); diff --git a/vector/v.split/main.c b/vector/v.split/main.c index f6947111462..51c598ed8f6 100644 --- a/vector/v.split/main.c +++ b/vector/v.split/main.c @@ -165,12 +165,12 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&In, in_opt->answer, "", layer_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); layer = Vect_get_field_number(&In, layer_opt->answer); if (Vect_open_new(&Out, out_opt->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), out_opt->answer); + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); Vect_copy_head_data(&In, &Out); Vect_hist_copy(&In, &Out); diff --git a/vector/v.support/main.c b/vector/v.support/main.c index c44c4d404a3..f8ba312e210 100644 --- a/vector/v.support/main.c +++ b/vector/v.support/main.c @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); if (Vect_open_old(&Map, map->answer, "") < 1) - G_fatal_error(_("Unable to open vector map <%s>"), map->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map->answer); /* modify 'head' file */ Vect_read_header(&Map); diff --git a/vector/v.surf.bspline/crosscorr.c b/vector/v.surf.bspline/crosscorr.c index 4586de2b529..df9f28ec872 100644 --- a/vector/v.surf.bspline/crosscorr.c +++ b/vector/v.surf.bspline/crosscorr.c @@ -116,7 +116,8 @@ int cross_correlation(struct Map_info *Map, double passWE, double passNS) Fi = Vect_get_field(Map, bspline_field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer " + "%d."), bspline_field); driver_cats = @@ -137,7 +138,7 @@ int cross_correlation(struct Map_info *Map, double passWE, double passNS) G_fatal_error(_("Column type not supported")); if (nrec < 0) - G_fatal_error(_("No records selected from table <%s> "), + G_fatal_error(_("No records selected from table <%s>."), Fi->table); G_debug(1, "%d records selected from table", nrec); diff --git a/vector/v.surf.bspline/main.c b/vector/v.surf.bspline/main.c index 29bf28af38e..d229e2d961c 100644 --- a/vector/v.surf.bspline/main.c +++ b/vector/v.surf.bspline/main.c @@ -294,7 +294,7 @@ int main(int argc, char *argv[]) dist); } else { - fprintf(stdout, _("No points in current region")); + fprintf(stdout, _("No points in current region.")); } Vect_close(&In); @@ -352,7 +352,7 @@ int main(int argc, char *argv[]) grid = FALSE; if (0 > Vect_open_new(&Out, out_opt->answer, WITH_Z)) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), out_opt->answer); /* Copy vector Head File */ diff --git a/vector/v.surf.idw/read_sites.c b/vector/v.surf.idw/read_sites.c index 8c77d66b6fe..34812d686eb 100644 --- a/vector/v.surf.idw/read_sites.c +++ b/vector/v.surf.idw/read_sites.c @@ -26,7 +26,7 @@ void read_sites(const char *name, const char *field_name, const char *col, Vect_set_open_level(1); /* without topology */ if (Vect_open_old2(&Map, name, "", field_name) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), name); + G_fatal_error(_("Unable to open vector map <%s>."), name); field = Vect_get_field_number(&Map, field_name); with_z = col == NULL && Vect_is_3d(&Map); /* read z-coordinates @@ -50,7 +50,7 @@ void read_sites(const char *name, const char *field_name, const char *col, Fi = Vect_get_field(&Map, field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %s"), + G_fatal_error(_("Database connection not defined for layer <%s>."), field_name); Driver = db_start_driver_open_database(Fi->driver, Fi->database); diff --git a/vector/v.surf.rst/main.c b/vector/v.surf.rst/main.c index f9d4076dd13..c3e6cf07811 100644 --- a/vector/v.surf.rst/main.c +++ b/vector/v.surf.rst/main.c @@ -569,7 +569,7 @@ int main(int argc, char *argv[]) open_check = Vect_open_old2(&Map, input, "", parm.field->answer); if (open_check < 1) - G_fatal_error(_("Unable to open vector map <%s>"), input); + G_fatal_error(_("Unable to open vector map <%s>."), input); /* if (open_check < 2) G_fatal_error(_("You first need to run v.build on vector map <%s>"), input); @@ -613,11 +613,11 @@ int main(int argc, char *argv[]) if (devi != NULL) { if (Vect_open_new(&Map2, devi, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), devi); + G_fatal_error(_("Unable to create vector map <%s>."), devi); } else { if (Vect_open_new(&Map2, cvdev, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), cvdev); + G_fatal_error(_("Unable to create vector map <%s>."), cvdev); } Vect_hist_command(&Map2); ff = Vect_default_field_info(&Map2, 1, NULL, GV_1TABLE); @@ -639,7 +639,7 @@ int main(int argc, char *argv[]) db_set_error_handler_driver(driver2); if (db_execute_immediate(driver2, &sql2) != DB_OK) { - G_fatal_error(_("Unable to create table '%s'"), + G_fatal_error(_("Unable to create table <%s>."), db_get_string(&sql2)); } db_begin_transaction(driver2); @@ -691,7 +691,7 @@ int main(int argc, char *argv[]) if (treefile != NULL) { if (0 > Vect_open_new(&TreeMap, treefile, 0)) { clean(); - G_fatal_error(_("Unable to open vector map <%s>"), treefile); + G_fatal_error(_("Unable to open vector map <%s>."), treefile); } Vect_hist_command(&TreeMap); @@ -813,7 +813,7 @@ int main(int argc, char *argv[]) if (overfile != NULL) { if (0 > Vect_open_new(&OverMap, overfile, 0)) { clean(); - G_fatal_error(_("Unable to create vector map <%s>"), overfile); + G_fatal_error(_("Unable to create vector map <%s>."), overfile); } Vect_hist_command(&OverMap); @@ -885,7 +885,7 @@ int print_tree(struct multtree *tree, double x_orig, double y_orig, xarray[4] = xarray[0]; if (Vect_copy_xyz_to_pnts(Points, xarray, yarray, zarray, 5) < 0) { clean(); - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } Vect_write_line(Map, (unsigned int)type, Points, Cats); diff --git a/vector/v.to.3d/main.c b/vector/v.to.3d/main.c index 4f2519949f1..a194778945d 100644 --- a/vector/v.to.3d/main.c +++ b/vector/v.to.3d/main.c @@ -65,7 +65,7 @@ int main(int argc, char **argv) /* open input vector, topology not needed */ Vect_set_open_level(1); if (Vect_open_old2(&In, opt.input->answer, "", opt.field->answer) < 1) - G_fatal_error(_("Unable to open vector map <%s>"), opt.input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.input->answer); Vect_set_error_handler_io(&In, &Out); if (opt.reverse->answer && !Vect_is_3d(&In)) { @@ -80,7 +80,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_new(&Out, opt.output->answer, opt.reverse->answer ? WITHOUT_Z : WITH_Z) == -1) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.output->answer); /* copy history & header */ diff --git a/vector/v.to.3d/trans2.c b/vector/v.to.3d/trans2.c index c4bde9b3888..c7e659d4b64 100644 --- a/vector/v.to.3d/trans2.c +++ b/vector/v.to.3d/trans2.c @@ -46,7 +46,7 @@ void trans2d(struct Map_info *In, struct Map_info *Out, int type, double height, Fi = Vect_get_field(In, field); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer <%s>"), + G_fatal_error(_("Database connection not defined for layer <%s>."), field_name); } diff --git a/vector/v.to.3d/trans3.c b/vector/v.to.3d/trans3.c index c332fd46eb5..1cca6a28343 100644 --- a/vector/v.to.3d/trans3.c +++ b/vector/v.to.3d/trans3.c @@ -49,7 +49,7 @@ void trans3d(struct Map_info *In, struct Map_info *Out, int type, Fi = Vect_get_field(Out, field); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer <%s>"), + G_fatal_error(_("Database connection not defined for layer <%s>."), field_name); } diff --git a/vector/v.to.db/main.c b/vector/v.to.db/main.c index 455ec4f3067..307abefa993 100644 --- a/vector/v.to.db/main.c +++ b/vector/v.to.db/main.c @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) /* open map */ Vect_set_open_level(2); if (Vect_open_old(&Map, options.name, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), options.name); + G_fatal_error(_("Unable to open vector map <%s>."), options.name); Vect_set_error_handler_io(&Map, NULL); Fi = Vect_get_field(&Map, options.field); diff --git a/vector/v.to.db/parse.c b/vector/v.to.db/parse.c index 54211d6c2eb..eca8b0b514e 100644 --- a/vector/v.to.db/parse.c +++ b/vector/v.to.db/parse.c @@ -75,8 +75,8 @@ int parse_command_line(int argc, char *argv[]) "* sqrt(PI * area))"), _("fractal dimension of boundary defining a polygon, calculated as fd " "= 2 * (log(perimeter) / log(area))"), - _("perimeter length of an area"), _("line length"), - _("number of features for each category"), + _("Perimeter length of an area"), _("line length"), + _("Number of features for each category"), _("point coordinates, X,Y or X,Y,Z"), _("line/boundary starting point coordinates, X,Y or X,Y,Z"), _("line/boundary end point coordinates, X,Y or X,Y,Z"), diff --git a/vector/v.to.points/main.c b/vector/v.to.points/main.c index ee103b19301..610b6912617 100644 --- a/vector/v.to.points/main.c +++ b/vector/v.to.points/main.c @@ -108,7 +108,7 @@ int main(int argc, char **argv) type = Vect_option_to_types(opt.type); dmax = atof(opt.dmax->answer); if (dmax <= 0) - G_fatal_error(_("Option %s must be positive"), opt.dmax->key); + G_fatal_error(_("Option <%s> must be positive."), opt.dmax->key); vertex_type = 0; if (opt.use->answer) { @@ -146,7 +146,7 @@ int main(int argc, char **argv) Vect_set_open_level(2); if (Vect_open_old2(&In, opt.input->answer, "", opt.lfield->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.input->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.input->answer); Vect_set_error_handler_io(&In, &Out); @@ -154,7 +154,7 @@ int main(int argc, char **argv) /* Open output segments */ if (Vect_open_new(&Out, opt.output->answer, Vect_is_3d(&In)) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.output->answer); Vect_copy_head_data(&In, &Out); @@ -208,7 +208,7 @@ int main(int argc, char **argv) db_append_string(&stmt, buf); if (db_execute_immediate(driver, &stmt) != DB_OK) { - G_fatal_error(_("Unable to create table: '%s'"), + G_fatal_error(_("Unable to create table: '%s'."), db_get_string(&stmt)); } diff --git a/vector/v.to.points/write.c b/vector/v.to.points/write.c index 6fea956ca17..5d0ad9eaa94 100644 --- a/vector/v.to.points/write.c +++ b/vector/v.to.points/write.c @@ -56,7 +56,7 @@ void write_point(struct Map_info *Out, double x, double y, double z, db_append_string(&stmt, buf); if (db_execute_immediate(driver, &stmt) != DB_OK) { - G_warning(_("Unable to insert new record: '%s'"), + G_warning(_("Unable to insert new record: '%s'."), db_get_string(&stmt)); } } diff --git a/vector/v.to.rast/support.c b/vector/v.to.rast/support.c index f37fc100c97..49d40408079 100644 --- a/vector/v.to.rast/support.c +++ b/vector/v.to.rast/support.c @@ -94,11 +94,12 @@ int update_dbcolors(const char *rast_name, const char *vector_map, int field, /* open vector map and database driver */ if (Vect_open_old(&Map, vector_map, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), vector_map); + G_fatal_error(_("Unable to open vector map <%s>."), vector_map); db_CatValArray_init(&cvarr); if ((Fi = Vect_get_field(&Map, field)) == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), field); + G_fatal_error(_("Database connection not defined for layer %d."), + field); if ((Driver = db_start_driver_open_database(Fi->driver, Fi->database)) == NULL) @@ -115,7 +116,7 @@ int update_dbcolors(const char *rast_name, const char *vector_map, int field, Fi->table); if (nrec < 0) - G_fatal_error(_("No records selected from table <%s>"), Fi->table); + G_fatal_error(_("No records selected from table <%s>."), Fi->table); G_debug(3, "nrec = %d", nrec); @@ -264,11 +265,11 @@ int update_labels(const char *rast_name, const char *vector_map, int field, /* open vector map and database driver */ Vect_set_open_level(1); if (Vect_open_old(&Map, vector_map, G_find_vector2(vector_map, "")) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), vector_map); + G_fatal_error(_("Unable to open vector map <%s>."), vector_map); 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); Vect_close(&Map); @@ -284,7 +285,7 @@ int update_labels(const char *rast_name, const char *vector_map, int field, Fi->table); if (nrec < 0) - G_fatal_error(_("No records selected from table <%s>"), Fi->table); + G_fatal_error(_("No records selected from table <%s>."), Fi->table); G_debug(3, "nrec = %d", nrec); @@ -294,7 +295,7 @@ int update_labels(const char *rast_name, const char *vector_map, int field, /* get column type */ if ((col_type = db_column_Ctype(Driver, Fi->table, label_column)) == -1) { - G_fatal_error(_("Column <%s> not found"), label_column); + G_fatal_error(_("Column <%s> not found."), label_column); } /* for each attribute */ @@ -492,11 +493,12 @@ int update_labels(const char *rast_name, const char *vector_map, int field, Vect_set_open_level(1); if (Vect_open_old(&Map, vector_map, G_find_vector2(vector_map, "")) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), vector_map); + G_fatal_error(_("Unable to open vector map <%s>."), vector_map); 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); Vect_close(&Map); @@ -514,7 +516,7 @@ int update_labels(const char *rast_name, const char *vector_map, int field, label_column, Fi->table); if (nrec < 0) - G_fatal_error(_("No records selected from table <%s>"), + G_fatal_error(_("No records selected from table <%s>."), Fi->table); G_debug(3, "nrec = %d", nrec); @@ -525,7 +527,7 @@ int update_labels(const char *rast_name, const char *vector_map, int field, /* get column type */ if ((col_type = db_column_Ctype(Driver, Fi->table, label_column)) == -1) { - G_fatal_error(_("Column <%s> not found"), label_column); + G_fatal_error(_("Column <%s> not found."), label_column); } /* close the database driver */ diff --git a/vector/v.to.rast/vect2rast.c b/vector/v.to.rast/vect2rast.c index e1a5cf09c85..22c99611702 100644 --- a/vector/v.to.rast/vect2rast.c +++ b/vector/v.to.rast/vect2rast.c @@ -36,7 +36,7 @@ int vect_to_rast(const char *vector_map, const char *raster_map, G_verbose_message(_("Loading data...")); Vect_set_open_level(2); if (Vect_open_old2(&Map, vector_map, "", field_name) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), vector_map); + G_fatal_error(_("Unable to open vector map <%s>."), vector_map); field = Vect_get_field_number(&Map, field_name); @@ -50,7 +50,7 @@ int vect_to_rast(const char *vector_map, const char *raster_map, case USE_ATTR: db_CatValArray_init(&cvarr); if (!(Fi = Vect_get_field(&Map, field))) - G_fatal_error(_("Database connection not defined for layer <%s>"), + G_fatal_error(_("Database connection not defined for layer <%s>."), field_name); if ((Driver = db_start_driver_open_database(Fi->driver, @@ -64,7 +64,7 @@ int vect_to_rast(const char *vector_map, const char *raster_map, if ((nrec = db_select_CatValArray(Driver, Fi->table, Fi->key, column, where, &cvarr)) == -1) - G_fatal_error(_("Column <%s> not found"), column); + G_fatal_error(_("Column <%s> not found."), column); G_debug(3, "nrec = %d", nrec); ctype = cvarr.ctype; @@ -74,7 +74,7 @@ int vect_to_rast(const char *vector_map, const char *raster_map, db_sqltype_name(ctype)); if (nrec < 0) - G_fatal_error(_("No records selected from table <%s>"), Fi->table); + G_fatal_error(_("No records selected from table <%s>."), Fi->table); G_debug(1, "%d records selected from table", nrec); diff --git a/vector/v.to.rast3/main.c b/vector/v.to.rast3/main.c index 3b4d78f0236..7f6285726f4 100644 --- a/vector/v.to.rast3/main.c +++ b/vector/v.to.rast3/main.c @@ -68,14 +68,14 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old2(&Map, in_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); field = Vect_get_field_number(&Map, field_opt->answer); db_CatValArray_init(&cvarr); Fi = Vect_get_field(&Map, field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer <%s>"), + G_fatal_error(_("Database connection not defined for layer <%s>."), field_opt->answer); Driver = db_start_driver_open_database(Fi->driver, Fi->database); diff --git a/vector/v.transform/main.c b/vector/v.transform/main.c index 3344c838d4e..18e767e2f75 100644 --- a/vector/v.transform/main.c +++ b/vector/v.transform/main.c @@ -201,7 +201,7 @@ int main(int argc, char *argv[]) /* open input vector */ if (Vect_open_old2(&Old, vold->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), vold->answer); + G_fatal_error(_("Unable to open vector map <%s>."), vold->answer); field = Vect_get_field_number(&Old, field_opt->answer); if (field < 1 && columns->answer) { @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) /* open output vector */ if (Vect_open_new(&New, vnew->answer, out3d) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), vnew->answer); + G_fatal_error(_("Unable to create vector map <%s>."), vnew->answer); /* copy and set header */ Vect_copy_head_data(&Old, &New); diff --git a/vector/v.type/main.c b/vector/v.type/main.c index bcf88c74d04..514f2f9e689 100644 --- a/vector/v.type/main.c +++ b/vector/v.type/main.c @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) /* open input vector */ Vect_set_open_level(1); if (Vect_open_old2(&In, in_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), in_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), in_opt->answer); field = Vect_get_field_number(&In, field_opt->answer); diff --git a/vector/v.univar/main.c b/vector/v.univar/main.c index e43a2260b96..7496e6a8efb 100644 --- a/vector/v.univar/main.c +++ b/vector/v.univar/main.c @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) shell_flag = G_define_flag(); shell_flag->key = 'g'; - shell_flag->label = _("Print the stats in shell script style [deprecated]"); + shell_flag->label = _("Print in shell script style [deprecated]"); shell_flag->description = _( "This flag is deprecated and will be removed in a future release. Use " "format=shell instead."); @@ -170,9 +170,9 @@ int main(int argc, char *argv[]) } if (shell_flag->answer) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed in a " + "future release. Use format=%s instead."), + 'g', "shell"); if (format == JSON) { G_fatal_error(_("The -g flag cannot be used with format=json. " "Please select only one output format.")); @@ -187,7 +187,7 @@ int main(int argc, char *argv[]) /* open input vector */ Vect_set_open_level(2); if (Vect_open_old2(&Map, map_opt->answer, "", field_opt->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), map_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), map_opt->answer); ofield = Vect_get_field_number(&Map, field_opt->answer); @@ -265,7 +265,7 @@ void select_from_geometry(void) } Fi = Vect_get_field(&Map, ofield); if (!Fi) { - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), ofield); } diff --git a/vector/v.vect.stats/main.c b/vector/v.vect.stats/main.c index c78cd498d7b..471e5fb5312 100644 --- a/vector/v.vect.stats/main.c +++ b/vector/v.vect.stats/main.c @@ -316,7 +316,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old(&PIn, point_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), point_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), point_opt->answer); /* Open areas vector */ if ((mapset = G_find_vector2(area_opt->answer, "")) == NULL) @@ -328,7 +328,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(2); if (Vect_open_old(&AIn, area_opt->answer, mapset) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), area_opt->answer); + G_fatal_error(_("Unable to open vector map <%s>."), area_opt->answer); point_field = atoi(point_field_opt->answer); pcat_list = NULL; @@ -377,7 +377,7 @@ int main(int argc, char *argv[]) AFi = Vect_get_field(&AIn, area_field); if (AFi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), area_field); Adriver = db_start_driver_open_database(AFi->driver, AFi->database); @@ -454,7 +454,7 @@ int main(int argc, char *argv[]) PFi = Vect_get_field(&PIn, point_field); if (PFi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), point_field); /* Open points map driver and database */ @@ -845,7 +845,7 @@ int main(int argc, char *argv[]) G_percent(nacats, nacats, 2); db_close_database_shutdown_driver(Adriver); db_free_string(&stmt); - G_message(_("%d records updated"), update_ok); + G_message(_("%d records updated."), update_ok); if (update_err > 0) G_message(_("%d update errors"), update_err); diff --git a/vector/v.vol.rst/main.c b/vector/v.vol.rst/main.c index 32c22003dd4..05e028323a9 100644 --- a/vector/v.vol.rst/main.c +++ b/vector/v.vol.rst/main.c @@ -545,7 +545,7 @@ int main(int argc, char *argv[]) Vect_set_open_level(1); if (Vect_open_old(&In, input, "") < 0) - G_fatal_error(_("Unable to open vector map <%s>"), input); + G_fatal_error(_("Unable to open vector map <%s>."), input); if (!Vect_is_3d(&In)) G_warning(_("Vector is not 3D")); @@ -565,11 +565,11 @@ int main(int argc, char *argv[]) if (devi != NULL) { if (Vect_open_new(&Map, devi, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), devi); + G_fatal_error(_("Unable to create vector map <%s>."), devi); } else { if (Vect_open_new(&Map, cvdev, 1) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), cvdev); + G_fatal_error(_("Unable to create vector map <%s>."), cvdev); } Vect_hist_command(&Map); f = Vect_default_field_info(&Map, 1, NULL, GV_1TABLE); @@ -591,7 +591,7 @@ int main(int argc, char *argv[]) db_set_error_handler_driver(driver); if (db_execute_immediate(driver, &sql) != DB_OK) { - G_fatal_error(_("Unable to create table '%s'"), + G_fatal_error(_("Unable to create table <%s>."), db_get_string(&sql)); } count = 1; @@ -602,7 +602,7 @@ int main(int argc, char *argv[]) mapset = NULL; mapset = G_find_raster2(cellinp, ""); if (mapset == NULL) - G_fatal_error(_("Raster map <%s> not found"), cellinp); + G_fatal_error(_("Raster map <%s> not found."), cellinp); fdcell = Rast_open_old(cellinp, mapset); fdcout = Rast_open_fp_new(cellout); zero_array_cell = (FCELL *)G_malloc(sizeof(FCELL) * n_cols); @@ -851,7 +851,7 @@ int main(int argc, char *argv[]) Rast_command_history(&hist); Rast_write_history(cellout, &hist); - G_message(_("Raster map <%s> created"), cellout); + G_message(_("Raster map <%s> created."), cellout); fclose(Tmp_fd_cell); unlink(Tmp_file_cell); @@ -891,7 +891,7 @@ int main(int argc, char *argv[]) db_close_database_shutdown_driver(driver); Vect_build(&Map); Vect_close(&Map); - G_message(_("Vector map <%s> created"), cvdev); + G_message(_("Vector map <%s> created."), cvdev); } fprintf(stderr, "\n"); diff --git a/vector/v.vol.rst/user1.c b/vector/v.vol.rst/user1.c index 3c99c090e2c..90d2760db63 100644 --- a/vector/v.vol.rst/user1.c +++ b/vector/v.vol.rst/user1.c @@ -372,7 +372,7 @@ int INPUT(struct Map_info *In, char *column, char *scol, char *wheresql) mapsetm = G_find_raster2(maskmap, ""); if (!mapsetm) { clean(); - G_fatal_error(_("Mask raster map [%s] not found"), maskmap); + G_fatal_error(_("Mask raster map <%s> not found."), maskmap); } bitmask = BM_create(nsizc, nsizr); cellmask = Rast_allocate_c_buf(); @@ -431,7 +431,7 @@ int OUTGR(void) if (!(data = (float *)G_malloc(sizeof(float) * nsizr * nsizc * nsizl))) { clean(); - G_fatal_error(_("Out of memory")); + G_fatal_error(_("Out of memory.")); } /*** Write elevation results ***/ diff --git a/vector/v.voronoi/main.c b/vector/v.voronoi/main.c index b1de8616e1a..e6867435486 100644 --- a/vector/v.voronoi/main.c +++ b/vector/v.voronoi/main.c @@ -187,7 +187,7 @@ int main(int argc, char **argv) /* open files */ Vect_set_open_level(2); if (Vect_open_old2(&In, opt.in->answer, "", opt.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.in->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.in->answer); Field = Vect_get_field_number(&In, opt.field->answer); @@ -212,12 +212,12 @@ int main(int argc, char **argv) G_fatal_error(_("Unable to create temporary vector map")); if (Vect_open_new(&Out2, opt.out->answer, 0) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.out->answer); } else { if (Vect_open_new(&Out, opt.out->answer, 0) < 0) - G_fatal_error(_("Unable to create vector map <%s>"), + G_fatal_error(_("Unable to create vector map <%s>."), opt.out->answer); } diff --git a/vector/v.what.rast/main.c b/vector/v.what.rast/main.c index 08063b73e97..1e08d40b622 100644 --- a/vector/v.what.rast/main.c +++ b/vector/v.what.rast/main.c @@ -165,14 +165,14 @@ int main(int argc, char *argv[]) Vect_open_old2(&Map, opt.vect->answer, print_flag->answer ? "" : G_mapset(), opt.field->answer); if (open_level < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.vect->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.vect->answer); field = Vect_get_field_number(&Map, opt.field->answer); Fi = Vect_get_field(&Map, field); if (!print_flag->answer) { if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), + G_fatal_error(_("Database connection not defined for layer %d."), field); /* Open driver */ diff --git a/vector/v.what.rast3/main.c b/vector/v.what.rast3/main.c index ac391b6d3f5..ab5c57f97f4 100644 --- a/vector/v.what.rast3/main.c +++ b/vector/v.what.rast3/main.c @@ -109,13 +109,14 @@ int main(int argc, char *argv[]) /* Open vector */ Vect_set_open_level(2); if (Vect_open_old2(&Map, opt.vect->answer, "", opt.field->answer) < 0) - G_fatal_error(_("Unable to open vector map <%s>"), opt.vect->answer); + G_fatal_error(_("Unable to open vector map <%s>."), opt.vect->answer); field = Vect_get_field_number(&Map, opt.field->answer); Fi = Vect_get_field(&Map, field); if (Fi == NULL) - G_fatal_error(_("Database connection not defined for layer %d"), field); + G_fatal_error(_("Database connection not defined for layer %d."), + field); /* Open driver */ driver = db_start_driver_open_database(Fi->driver, Fi->database); @@ -137,7 +138,7 @@ int main(int argc, char *argv[]) col_type = db_column_Ctype(driver, Fi->table, opt.col->answer); if (col_type == -1) - G_fatal_error(_("Column <%s> not found"), opt.col->answer); + G_fatal_error(_("Column <%s> not found."), opt.col->answer); if (col_type != DB_C_TYPE_DOUBLE) G_fatal_error(_( diff --git a/vector/v.what/main.c b/vector/v.what/main.c index bfce0f9ea52..7ab7379f631 100644 --- a/vector/v.what/main.c +++ b/vector/v.what/main.c @@ -116,7 +116,7 @@ int main(int argc, char **argv) flag.shell = G_define_flag(); flag.shell->key = 'g'; - flag.shell->label = _("Print the stats in shell script style [deprecated]"); + flag.shell->label = _("Print in shell script style [deprecated]"); flag.shell->description = _( "This flag is deprecated and will be removed in a future release. Use " "format=shell instead."); @@ -183,14 +183,14 @@ int main(int argc, char **argv) format = flag.shell->answer ? SHELL : (flag.json->answer ? LEGACY_JSON : PLAIN); if (format == LEGACY_JSON) { - G_verbose_message( - _("Flag 'j' is deprecated and will be removed in a future " - "release. Please use format=json instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed " + "in a future release. Use format=%s instead."), + 'j', "json"); } else if (format == SHELL) { - G_verbose_message( - _("Flag 'g' is deprecated and will be removed in a future " - "release. Please use format=shell instead.")); + G_verbose_message(_("Flag '%c' is deprecated and will be removed " + "in a future release. Use format=%s instead."), + 'g', "shell"); } } else {