diff --git a/po/POTFILES.in b/po/POTFILES.in
index d3dde11a..fe4b41dc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,326 +1,267 @@
-libvips/arithmetic/linear.c
-libvips/arithmetic/avg.c
-libvips/arithmetic/divide.c
-libvips/arithmetic/arith_dispatch.c
-libvips/arithmetic/measure.c
-libvips/arithmetic/stats.c
-libvips/arithmetic/math2.c
-libvips/arithmetic/im_linreg.c
-libvips/arithmetic/round.c
-libvips/arithmetic/deviate.c
-libvips/arithmetic/unary.c
-libvips/arithmetic/unaryconst.c
-libvips/arithmetic/add.c
-libvips/arithmetic/arithmetic.c
-libvips/arithmetic/multiply.c
-libvips/arithmetic/min.c
-libvips/arithmetic/im_point_bilinear.c
-libvips/arithmetic/complex.c
-libvips/arithmetic/im_cross_phase.c
-libvips/arithmetic/im_maxpos_avg.c
-libvips/arithmetic/invert.c
-libvips/arithmetic/remainder.c
-libvips/arithmetic/math.c
 libvips/arithmetic/abs.c
-libvips/arithmetic/relational.c
-libvips/arithmetic/binary.c
-libvips/arithmetic/sign.c
+libvips/arithmetic/complex.c
+libvips/arithmetic/invert.c
+libvips/arithmetic/im_maxpos_avg.c
+libvips/arithmetic/multiply.c
+libvips/arithmetic/round.c
 libvips/arithmetic/subtract.c
-libvips/arithmetic/im_maxpos_vec.c
-libvips/arithmetic/statistic.c
-libvips/arithmetic/boolean.c
+libvips/arithmetic/min.c
+libvips/arithmetic/unaryconst.c
+libvips/arithmetic/im_point_bilinear.c
+libvips/arithmetic/avg.c
+libvips/arithmetic/arith_dispatch.c
 libvips/arithmetic/max.c
+libvips/arithmetic/statistic.c
+libvips/arithmetic/divide.c
+libvips/arithmetic/stats.c
+libvips/arithmetic/binary.c
+libvips/arithmetic/im_maxpos_vec.c
+libvips/arithmetic/deviate.c
+libvips/arithmetic/relational.c
+libvips/arithmetic/measure.c
+libvips/arithmetic/remainder.c
+libvips/arithmetic/unary.c
+libvips/arithmetic/im_linreg.c
+libvips/arithmetic/math.c
+libvips/arithmetic/arithmetic.c
+libvips/arithmetic/add.c
+libvips/arithmetic/im_cross_phase.c
+libvips/arithmetic/math2.c
+libvips/arithmetic/linear.c
+libvips/arithmetic/boolean.c
+libvips/arithmetic/sign.c
 libvips/cimg/cimg_dispatch.c
-libvips/colour/im_XYZ2disp.c
-libvips/colour/im_LabQ2LabS.c
-libvips/colour/im_dECMC_fromLab.c
+libvips/colour/sRGB2XYZ.c
+libvips/colour/Lab2XYZ.c
+libvips/colour/LCh2Lab.c
+libvips/colour/LCh2UCS.c
+libvips/colour/dE00.c
+libvips/colour/icc_transform.c
 libvips/colour/colour_dispatch.c
-libvips/colour/im_LCh2UCS.c
-libvips/colour/im_Lab2LabQ.c
-libvips/colour/im_Lab2LabS.c
-libvips/colour/im_XYZ2Yxy.c
-libvips/colour/im_disp2XYZ.c
-libvips/colour/im_UCS2LCh.c
-libvips/colour/im_LabQ2Lab.c
-libvips/colour/disp.c
-libvips/colour/im_LCh2Lab.c
+libvips/colour/dECMC.c
 libvips/colour/colour.c
-libvips/colour/im_rad2float.c
-libvips/colour/im_icc_transform.c
-libvips/colour/derived.c
-libvips/colour/im_float2rad.c
-libvips/colour/im_Lab2LCh.c
-libvips/colour/im_LabS2Lab.c
-libvips/colour/im_dE00_fromLab.c
-libvips/colour/im_XYZ2Lab.c
-libvips/colour/im_Yxy2XYZ.c
-libvips/colour/im_lab_morph.c
-libvips/colour/im_dE_fromLab.c
-libvips/colour/im_Lab2XYZ.c
-libvips/colour/im_LabQ2disp.c
-libvips/colour/im_LabS2LabQ.c
-libvips/conversion/flip.c
-libvips/conversion/bandmean.c
+libvips/colour/rad2float.c
+libvips/colour/UCS2LCh.c
+libvips/colour/XYZ2sRGB.c
+libvips/colour/Lab2LabQ.c
+libvips/colour/colourspace.c
+libvips/colour/Lab2LabS.c
+libvips/colour/LabS2LabQ.c
+libvips/colour/Lab2LCh.c
+libvips/colour/Yxy2XYZ.c
+libvips/colour/LabQ2sRGB.c
+libvips/colour/float2rad.c
+libvips/colour/XYZ2Yxy.c
+libvips/colour/dE76.c
+libvips/colour/XYZ2Lab.c
+libvips/colour/LabQ2LabS.c
+libvips/colour/LabQ2Lab.c
+libvips/colour/LabS2Lab.c
+libvips/conversion/rot.c
+libvips/conversion/conversion.c
+libvips/conversion/recomb.c
+libvips/conversion/flatten.c
+libvips/conversion/replicate.c
+libvips/conversion/bandary.c
+libvips/conversion/cache.c
+libvips/conversion/black.c
+libvips/conversion/im_msb.c
+libvips/conversion/join.c
 libvips/conversion/im_zoom.c
+libvips/conversion/extract.c
+libvips/conversion/ifthenelse.c
+libvips/conversion/im_scale.c
+libvips/conversion/tilecache.c
+libvips/conversion/flip.c
+libvips/conversion/conver_dispatch.c
+libvips/conversion/bandjoin.c
+libvips/conversion/im_grid.c
+libvips/conversion/im_wrap.c
+libvips/conversion/im_subsample.c
+libvips/conversion/copy.c
+libvips/conversion/im_text.c
+libvips/conversion/cast.c
+libvips/conversion/sequential.c
+libvips/conversion/embed.c
+libvips/conversion/im_scaleps.c
+libvips/conversion/im_system_image.c
+libvips/conversion/insert.c
 libvips/conversion/im_system.c
 libvips/conversion/im_gaussnoise.c
-libvips/conversion/bandary.c
-libvips/conversion/cast.c
-libvips/conversion/conversion.c
-libvips/conversion/flatten.c
-libvips/conversion/im_subsample.c
-libvips/conversion/im_grid.c
-libvips/conversion/extract.c
-libvips/conversion/bandjoin.c
-libvips/conversion/im_msb.c
+libvips/conversion/bandmean.c
 libvips/conversion/im_copy_file.c
-libvips/conversion/black.c
-libvips/conversion/copy.c
-libvips/conversion/rot.c
-libvips/conversion/im_scale.c
-libvips/conversion/replicate.c
-libvips/conversion/join.c
-libvips/conversion/im_text.c
-libvips/conversion/conver_dispatch.c
-libvips/conversion/im_scaleps.c
-libvips/conversion/im_wrap.c
-libvips/conversion/insert.c
-libvips/conversion/tilecache.c
-libvips/conversion/im_system_image.c
-libvips/conversion/embed.c
-libvips/conversion/cache.c
 libvips/conversion/im_falsecolour.c
-libvips/conversion/ifthenelse.c
-libvips/conversion/recomb.c
-libvips/conversion/sequential.c
-libvips/convolution/im_conv.c
 libvips/convolution/im_fastcor.c
-libvips/convolution/im_contrast_surface.c
-libvips/convolution/im_compass.c
-libvips/convolution/im_spcor.c
-libvips/convolution/im_gradcor.c
-libvips/convolution/im_conv_f.c
-libvips/convolution/im_aconvsep.c
-libvips/convolution/convol_dispatch.c
 libvips/convolution/im_aconv.c
-libvips/convolution/im_addgnoise.c
 libvips/convolution/im_sharpen.c
-libvips/foreign/rawsave.c
-libvips/foreign/radload.c
-libvips/foreign/tiffload.c
-libvips/foreign/magick2vips.c
-libvips/foreign/ppmsave.c
-libvips/foreign/vipsload.c
-libvips/foreign/pngload.c
-libvips/foreign/analyze2vips.c
+libvips/convolution/convol_dispatch.c
+libvips/convolution/im_conv.c
+libvips/convolution/im_addgnoise.c
+libvips/convolution/im_contrast_surface.c
+libvips/convolution/im_aconvsep.c
+libvips/convolution/im_spcor.c
+libvips/convolution/im_compass.c
+libvips/convolution/im_conv_f.c
+libvips/convolution/im_gradcor.c
 libvips/foreign/jpeg2vips.c
 libvips/foreign/radiance.c
-libvips/foreign/openexrload.c
-libvips/foreign/tiffsave.c
-libvips/foreign/dzsave.c
-libvips/foreign/analyzeload.c
-libvips/foreign/jpegsave.c
 libvips/foreign/vips2jpeg.c
-libvips/foreign/ppm.c
-libvips/foreign/fitsload.c
-libvips/foreign/ppmload.c
-libvips/foreign/csvload.c
-libvips/foreign/magickload.c
-libvips/foreign/openslideload.c
-libvips/foreign/csvsave.c
-libvips/foreign/jpegload.c
-libvips/foreign/rawload.c
-libvips/foreign/openexr2vips.c
-libvips/foreign/tiff2vips.c
-libvips/foreign/csv.c
-libvips/foreign/matload.c
-libvips/foreign/fitssave.c
-libvips/foreign/radsave.c
+libvips/foreign/openexrload.c
 libvips/foreign/vipssave.c
-libvips/foreign/fits.c
-libvips/foreign/openslide2vips.c
-libvips/foreign/pngsave.c
+libvips/foreign/rawsave.c
+libvips/foreign/csvsave.c
+libvips/foreign/radsave.c
+libvips/foreign/rawload.c
 libvips/foreign/vips2tiff.c
-libvips/foreign/foreign.c
-libvips/foreign/vipspng.c
+libvips/foreign/fits.c
 libvips/foreign/matlab.c
-libvips/freq_filt/im_phasecor_fft.c
-libvips/freq_filt/im_freqflt.c
-libvips/freq_filt/im_fractsurf.c
-libvips/freq_filt/im_freq_mask.c
-libvips/freq_filt/freq_dispatch.c
-libvips/freq_filt/im_disp_ps.c
-libvips/freq_filt/im_fwfft.c
-libvips/freq_filt/im_invfftr.c
-libvips/freq_filt/fmaskcir.c
+libvips/foreign/csvload.c
+libvips/foreign/jpegload.c
+libvips/foreign/magickload.c
+libvips/foreign/matload.c
+libvips/foreign/tiff2vips.c
+libvips/foreign/openexr2vips.c
+libvips/foreign/foreign.c
+libvips/foreign/jpegsave.c
+libvips/foreign/dzsave.c
+libvips/foreign/openslide2vips.c
+libvips/foreign/analyze2vips.c
+libvips/foreign/ppmsave.c
+libvips/foreign/tiffsave.c
+libvips/foreign/fitssave.c
+libvips/foreign/csv.c
+libvips/foreign/pngload.c
+libvips/foreign/fitsload.c
+libvips/foreign/vipsload.c
+libvips/foreign/vipspng.c
+libvips/foreign/tiffload.c
+libvips/foreign/magick2vips.c
+libvips/foreign/analyzeload.c
+libvips/foreign/ppm.c
+libvips/foreign/openslideload.c
+libvips/foreign/pngsave.c
+libvips/foreign/radload.c
+libvips/foreign/ppmload.c
 libvips/freq_filt/fmask4th.c
-libvips/freq_filt/im_invfft.c
 libvips/freq_filt/im_rotquad.c
-libvips/histograms_lut/im_histeq.c
-libvips/histograms_lut/im_buildlut.c
-libvips/histograms_lut/im_histnD.c
-libvips/histograms_lut/im_histspec.c
-libvips/histograms_lut/im_heq.c
-libvips/histograms_lut/im_hist.c
-libvips/histograms_lut/im_stdif.c
-libvips/histograms_lut/im_invertlut.c
-libvips/histograms_lut/im_histplot.c
-libvips/histograms_lut/im_project.c
-libvips/histograms_lut/im_gammacorrect.c
+libvips/freq_filt/im_disp_ps.c
+libvips/freq_filt/fmaskcir.c
+libvips/freq_filt/im_fractsurf.c
+libvips/freq_filt/im_invfft.c
+libvips/freq_filt/im_freqflt.c
+libvips/freq_filt/freq_dispatch.c
+libvips/freq_filt/im_freq_mask.c
+libvips/freq_filt/im_phasecor_fft.c
+libvips/freq_filt/im_invfftr.c
+libvips/freq_filt/im_fwfft.c
 libvips/histograms_lut/im_hsp.c
-libvips/histograms_lut/im_mpercent.c
-libvips/histograms_lut/im_histgr.c
-libvips/histograms_lut/hist_dispatch.c
-libvips/histograms_lut/im_histindexed.c
 libvips/histograms_lut/tone.c
-libvips/histograms_lut/im_lhisteq.c
+libvips/histograms_lut/im_histspec.c
+libvips/histograms_lut/im_mpercent.c
+libvips/histograms_lut/im_stdif.c
+libvips/histograms_lut/hist_dispatch.c
+libvips/histograms_lut/im_heq.c
+libvips/histograms_lut/im_histnD.c
+libvips/histograms_lut/im_invertlut.c
+libvips/histograms_lut/im_histindexed.c
+libvips/histograms_lut/im_buildlut.c
+libvips/histograms_lut/im_project.c
 libvips/histograms_lut/im_identity.c
 libvips/histograms_lut/im_maplut.c
-libvips/inplace/im_draw_point.c
-libvips/inplace/im_draw_line.c
-libvips/inplace/im_draw_rect.c
-libvips/inplace/im_draw_image.c
-libvips/inplace/draw.c
-libvips/inplace/flood.c
-libvips/inplace/im_draw_circle.c
-libvips/inplace/im_draw_mask.c
+libvips/histograms_lut/im_histeq.c
+libvips/histograms_lut/im_lhisteq.c
+libvips/histograms_lut/im_gammacorrect.c
+libvips/histograms_lut/im_histgr.c
+libvips/histograms_lut/im_histplot.c
+libvips/histograms_lut/im_hist.c
 libvips/inplace/im_draw_smudge.c
+libvips/inplace/im_draw_circle.c
+libvips/inplace/im_draw_rect.c
+libvips/inplace/im_draw_mask.c
+libvips/inplace/draw.c
+libvips/inplace/im_draw_point.c
+libvips/inplace/flood.c
+libvips/inplace/im_draw_image.c
+libvips/inplace/im_draw_line.c
 libvips/inplace/inplace_dispatch.c
-libvips/iofuncs/vector.c
-libvips/iofuncs/operation.c
-libvips/iofuncs/sinkdisc.c
-libvips/iofuncs/vips.c
-libvips/iofuncs/buffer.c
-libvips/iofuncs/enumtypes.c
-libvips/iofuncs/semaphore.c
-libvips/iofuncs/sinkscreen.c
 libvips/iofuncs/window.c
-libvips/iofuncs/sinkmemory.c
-libvips/iofuncs/header.c
-libvips/iofuncs/type.c
-libvips/iofuncs/image.c
-libvips/iofuncs/region.c
-libvips/iofuncs/sink.c
-libvips/iofuncs/error.c
-libvips/iofuncs/util.c
-libvips/iofuncs/buf.c
 libvips/iofuncs/base64.c
-libvips/iofuncs/generate.c
-libvips/iofuncs/mapfile.c
-libvips/iofuncs/rect.c
-libvips/iofuncs/init.c
-libvips/iofuncs/object.c
-libvips/iofuncs/threadpool.c
+libvips/iofuncs/type.c
 libvips/iofuncs/memory.c
+libvips/iofuncs/vips.c
+libvips/iofuncs/init.c
+libvips/iofuncs/enumtypes.c
 libvips/iofuncs/cache.c
+libvips/iofuncs/buffer.c
+libvips/iofuncs/sinkmemory.c
+libvips/iofuncs/rect.c
+libvips/iofuncs/buf.c
+libvips/iofuncs/threadpool.c
+libvips/iofuncs/operation.c
+libvips/iofuncs/header.c
+libvips/iofuncs/vector.c
+libvips/iofuncs/semaphore.c
+libvips/iofuncs/error.c
+libvips/iofuncs/sinkdisc.c
+libvips/iofuncs/sink.c
+libvips/iofuncs/generate.c
+libvips/iofuncs/region.c
+libvips/iofuncs/mapfile.c
+libvips/iofuncs/image.c
+libvips/iofuncs/util.c
+libvips/iofuncs/sinkscreen.c
+libvips/iofuncs/object.c
 libvips/morphology/im_cntlines.c
-libvips/morphology/im_profile.c
-libvips/morphology/morph_dispatch.c
 libvips/morphology/im_rank_image.c
+libvips/morphology/im_label_regions.c
 libvips/morphology/morphology.c
 libvips/morphology/im_zerox.c
-libvips/morphology/im_label_regions.c
+libvips/morphology/im_profile.c
+libvips/morphology/morph_dispatch.c
 libvips/morphology/im_rank.c
-libvips/mosaicing/mosaic1.c
-libvips/mosaicing/im_clinear.c
-libvips/mosaicing/match.c
-libvips/mosaicing/mosaicing_dispatch.c
-libvips/mosaicing/im_improve.c
 libvips/mosaicing/im_tbmosaic.c
-libvips/mosaicing/im_tbmerge.c
-libvips/mosaicing/global_balance.c
-libvips/mosaicing/im_align_bands.c
-libvips/mosaicing/im_lrmerge.c
-libvips/mosaicing/im_initialize.c
 libvips/mosaicing/im_avgdxdy.c
-libvips/mosaicing/im_maxpos_subpel.c
-libvips/mosaicing/im_lrmosaic.c
-libvips/mosaicing/im_lrcalcon.c
-libvips/mosaicing/im_chkpair.c
-libvips/mosaicing/im_remosaic.c
 libvips/mosaicing/im_tbcalcon.c
+libvips/mosaicing/im_tbmerge.c
+libvips/mosaicing/im_lrcalcon.c
+libvips/mosaicing/im_clinear.c
+libvips/mosaicing/im_remosaic.c
+libvips/mosaicing/im_maxpos_subpel.c
+libvips/mosaicing/im_chkpair.c
+libvips/mosaicing/im_initialize.c
+libvips/mosaicing/im_align_bands.c
+libvips/mosaicing/mosaic1.c
+libvips/mosaicing/im_lrmerge.c
+libvips/mosaicing/im_lrmosaic.c
+libvips/mosaicing/im_improve.c
+libvips/mosaicing/mosaicing_dispatch.c
+libvips/mosaicing/match.c
+libvips/mosaicing/global_balance.c
+libvips/other/im_eye.c
 libvips/other/other_dispatch.c
-libvips/other/im_benchmark.c
+libvips/other/im_grey.c
 libvips/other/im_sines.c
+libvips/other/im_benchmark.c
 libvips/other/im_make_xy.c
 libvips/other/im_zone.c
-libvips/other/im_eye.c
-libvips/other/im_grey.c
-libvips/resample/resample_dispatch.c
-libvips/resample/shrink.c
-libvips/resample/resample.c
-libvips/resample/im_affine.c
-libvips/resample/transform.c
 libvips/resample/interpolate.c
-libvips/video/video_dispatch.c
+libvips/resample/resample.c
+libvips/resample/transform.c
+libvips/resample/shrink.c
+libvips/resample/im_affine.c
+libvips/resample/resample_dispatch.c
+libvips/resample/quadratic.c
 libvips/video/im_video_test.c
 libvips/video/im_video_v4l1.c
+libvips/video/video_dispatch.c
 tools/edvips.c
 tools/find_mosaic.c
 tools/header.c
 tools/mergeup.c
 tools/vips.c
 tools/vipsthumbnail.c
-libvipsCC/VDisplay.cc
-libvipsCC/VError.cc
-libvipsCC/VImage.cc
-libvipsCC/VMask.cc
-libvipsCC/include/vips/VImage.h
-libvipsCC/include/vips/vipscpp.h
-libvipsCC/include/vips/VDisplay.h
-libvipsCC/include/vips/VError.h
-libvipsCC/include/vips/VMask.h
-libvips/include/vips/mosaicing.h
-libvips/include/vips/semaphore.h
-libvips/include/vips/freq_filt.h
-libvips/include/vips/cimg_funcs.h
-libvips/include/vips/operation.h
-libvips/include/vips/vips.h
-libvips/include/vips/memory.h
-libvips/include/vips/buf.h
-libvips/include/vips/dispatch.h
-libvips/include/vips/vips7compat.h
-libvips/include/vips/conversion.h
-libvips/include/vips/basic.h
-libvips/include/vips/inplace.h
-libvips/include/vips/relational.h
-libvips/include/vips/mask.h
-libvips/include/vips/rect.h
-libvips/include/vips/generate.h
-libvips/include/vips/arithmetic.h
-libvips/include/vips/version.h
-libvips/include/vips/util.h
-libvips/include/vips/almostdeprecated.h
-libvips/include/vips/colour.h
-libvips/include/vips/threadpool.h
-libvips/include/vips/vector.h
-libvips/include/vips/morphology.h
-libvips/include/vips/error.h
-libvips/include/vips/transform.h
-libvips/include/vips/region.h
-libvips/include/vips/header.h
-libvips/include/vips/image.h
-libvips/include/vips/intl.h
-libvips/include/vips/video.h
-libvips/include/vips/enumtypes.h
-libvips/include/vips/thread.h
-libvips/include/vips/convolution.h
-libvips/include/vips/debug.h
-libvips/include/vips/interpolate.h
-libvips/include/vips/private.h
-libvips/include/vips/format.h
-libvips/include/vips/object.h
-libvips/include/vips/deprecated.h
-libvips/include/vips/inlines.h
-libvips/include/vips/histograms_lut.h
-libvips/include/vips/other.h
-libvips/include/vips/foreign.h
-libvips/include/vips/resample.h
-libvips/include/vips/internal.h
-libvips/include/vips/disp.h
-libvips/include/vips/type.h
 libvips/cimg/cimg.cpp
 libvips/resample/vsqbs.cpp
-libvips/resample/nohalo.cpp
-libvips/resample/lbb.cpp
 libvips/resample/bicubic.cpp
+libvips/resample/lbb.cpp
+libvips/resample/nohalo.cpp
diff --git a/po/vips7.pot b/po/vips7.pot
index 46196cb3..7d76960a 100644
--- a/po/vips7.pot
+++ b/po/vips7.pot
@@ -7,17 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=glib&keywords=I18N+L10N&component=general\n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"POT-Creation-Date: 2012-09-08 14:01+0100\n"
-=======
-"POT-Creation-Date: 2012-10-01 14:17+0100\n"
->>>>>>> origin/master
-=======
-"POT-Creation-Date: 2012-11-14 09:36+0000\n"
->>>>>>> origin/7.30
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-11-16 21:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,48 +18,117 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../libvips/arithmetic/linear.c:249
-msgid "calculate (a * in + b)"
+#: ../libvips/arithmetic/abs.c:215
+msgid "absolute value of an image"
 msgstr ""
 
-#: ../libvips/arithmetic/linear.c:257
-msgid "a"
+#: ../libvips/arithmetic/complex.c:215
+msgid "perform a complex operation on an image"
 msgstr ""
 
-#: ../libvips/arithmetic/linear.c:258
-msgid "Multiply by this"
+#: ../libvips/arithmetic/complex.c:222 ../libvips/arithmetic/complex.c:476
+#: ../libvips/arithmetic/relational.c:227
+#: ../libvips/arithmetic/relational.c:560 ../libvips/arithmetic/math.c:206
+#: ../libvips/arithmetic/math2.c:207 ../libvips/arithmetic/math2.c:405
+#: ../libvips/arithmetic/boolean.c:218 ../libvips/arithmetic/boolean.c:521
+msgid "Operation"
 msgstr ""
 
-#: ../libvips/arithmetic/linear.c:264
-msgid "b"
+#: ../libvips/arithmetic/complex.c:223 ../libvips/arithmetic/complex.c:477
+msgid "complex to perform"
 msgstr ""
 
-#: ../libvips/arithmetic/linear.c:265
-msgid "Add this"
+#: ../libvips/arithmetic/complex.c:468
+msgid "get a component from a complex image"
 msgstr ""
 
-#: ../libvips/arithmetic/avg.c:210 ../libvips/arithmetic/stats.c:415
-#: ../libvips/arithmetic/deviate.c:211
-msgid "find image average"
+#: ../libvips/arithmetic/complex.c:667
+msgid "form a complex image from two real images"
 msgstr ""
 
-#: ../libvips/arithmetic/avg.c:218 ../libvips/arithmetic/measure.c:202
-#: ../libvips/arithmetic/stats.c:423 ../libvips/arithmetic/deviate.c:219
-#: ../libvips/arithmetic/arithmetic.c:385 ../libvips/arithmetic/min.c:325
-#: ../libvips/arithmetic/max.c:324 ../libvips/conversion/conversion.c:89
-#: ../libvips/foreign/foreign.c:926 ../libvips/resample/resample.c:95
-msgid "Output"
-msgstr ""
-
-#: ../libvips/arithmetic/avg.c:219 ../libvips/arithmetic/deviate.c:220
-#: ../libvips/arithmetic/min.c:326 ../libvips/arithmetic/max.c:325
-msgid "Output value"
+#: ../libvips/arithmetic/invert.c:152
+msgid "invert an image"
 msgstr ""
 
 #. Name
-#: ../libvips/arithmetic/divide.c:228
-#: ../libvips/arithmetic/arith_dispatch.c:546
-msgid "divide two images"
+#: ../libvips/arithmetic/multiply.c:172
+#: ../libvips/arithmetic/arith_dispatch.c:1244
+msgid "multiply two images"
+msgstr ""
+
+#: ../libvips/arithmetic/round.c:160
+msgid "perform a round function on an image"
+msgstr ""
+
+#: ../libvips/arithmetic/round.c:168
+msgid "Round operation"
+msgstr ""
+
+#: ../libvips/arithmetic/round.c:169
+msgid "rounding operation to perform"
+msgstr ""
+
+#. Name
+#: ../libvips/arithmetic/subtract.c:161
+#: ../libvips/arithmetic/arith_dispatch.c:1336
+msgid "subtract two images"
+msgstr ""
+
+#: ../libvips/arithmetic/min.c:317
+msgid "find image minimum"
+msgstr ""
+
+#: ../libvips/arithmetic/min.c:325 ../libvips/arithmetic/avg.c:218
+#: ../libvips/arithmetic/max.c:324 ../libvips/arithmetic/stats.c:423
+#: ../libvips/arithmetic/deviate.c:220 ../libvips/arithmetic/measure.c:203
+#: ../libvips/arithmetic/arithmetic.c:386 ../libvips/colour/colour.c:172
+#: ../libvips/colour/colourspace.c:309 ../libvips/conversion/conversion.c:89
+#: ../libvips/foreign/foreign.c:928 ../libvips/resample/resample.c:98
+msgid "Output"
+msgstr ""
+
+#: ../libvips/arithmetic/min.c:326 ../libvips/arithmetic/avg.c:219
+#: ../libvips/arithmetic/max.c:325 ../libvips/arithmetic/deviate.c:221
+msgid "Output value"
+msgstr ""
+
+#: ../libvips/arithmetic/min.c:332 ../libvips/arithmetic/max.c:331
+#: ../libvips/conversion/embed.c:556
+msgid "x"
+msgstr ""
+
+#: ../libvips/arithmetic/min.c:333
+msgid "Horizontal position of minimum"
+msgstr ""
+
+#: ../libvips/arithmetic/min.c:339 ../libvips/arithmetic/max.c:338
+#: ../libvips/conversion/embed.c:563
+msgid "y"
+msgstr ""
+
+#: ../libvips/arithmetic/min.c:340
+msgid "Vertical position of minimum"
+msgstr ""
+
+#: ../libvips/arithmetic/unaryconst.c:202
+msgid "unary operations with a constant"
+msgstr ""
+
+#: ../libvips/arithmetic/unaryconst.c:206
+msgid "c"
+msgstr ""
+
+#: ../libvips/arithmetic/unaryconst.c:207
+msgid "Array of constants"
+msgstr ""
+
+#: ../libvips/arithmetic/im_point_bilinear.c:75
+msgid "coords outside image"
+msgstr ""
+
+#: ../libvips/arithmetic/avg.c:210 ../libvips/arithmetic/stats.c:415
+#: ../libvips/arithmetic/deviate.c:212
+msgid "find image average"
 msgstr ""
 
 #. Name
@@ -111,6 +171,12 @@ msgstr ""
 msgid "[x,y,z]^pel of image"
 msgstr ""
 
+#. Name
+#: ../libvips/arithmetic/arith_dispatch.c:546
+#: ../libvips/arithmetic/divide.c:228
+msgid "divide two images"
+msgstr ""
+
 #. Name
 #: ../libvips/arithmetic/arith_dispatch.c:565
 msgid "photographic negative"
@@ -247,12 +313,6 @@ msgstr ""
 msgid "remainder after integer division by a vector of constants"
 msgstr ""
 
-#. Name
-#: ../libvips/arithmetic/arith_dispatch.c:1244
-#: ../libvips/arithmetic/multiply.c:172
-msgid "multiply two images"
-msgstr ""
-
 #. Name
 #: ../libvips/arithmetic/arith_dispatch.c:1265
 msgid "pel^x of image"
@@ -268,12 +328,6 @@ msgstr ""
 msgid "many image statistics in one pass"
 msgstr ""
 
-#. Name
-#: ../libvips/arithmetic/arith_dispatch.c:1336
-#: ../libvips/arithmetic/subtract.c:161
-msgid "subtract two images"
-msgstr ""
-
 #. Name
 #: ../libvips/arithmetic/arith_dispatch.c:1384
 msgid "pixelwise linear regression"
@@ -284,266 +338,65 @@ msgstr ""
 msgid "phase of cross power spectrum of two complex images"
 msgstr ""
 
-#: ../libvips/arithmetic/measure.c:163
-#, c-format
-msgid "patch %d x %d, band %d: avg = %g, sdev = %g"
+#: ../libvips/arithmetic/max.c:316
+msgid "find image maximum"
 msgstr ""
 
-#: ../libvips/arithmetic/measure.c:192
-msgid "measure a set of patches on a colour chart"
+#: ../libvips/arithmetic/max.c:332
+msgid "Horizontal position of maximum"
 msgstr ""
 
-#: ../libvips/arithmetic/measure.c:196
-msgid "in"
+#: ../libvips/arithmetic/max.c:339
+msgid "Vertical position of maximum"
 msgstr ""
 
-#: ../libvips/arithmetic/measure.c:197
-msgid "Image to measure"
+#: ../libvips/arithmetic/statistic.c:147
+msgid "VIPS statistic operations"
 msgstr ""
 
-#: ../libvips/arithmetic/measure.c:203 ../libvips/arithmetic/stats.c:424
-msgid "Output array of statistics"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:208 ../libvips/conversion/replicate.c:202
-msgid "Across"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:209
-msgid "Number of patches across chart"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:215 ../libvips/conversion/replicate.c:209
-msgid "Down"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:216
-msgid "Number of patches down chart"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:222 ../libvips/arithmetic/binary.c:95
-#: ../libvips/conversion/extract.c:203
-msgid "Left"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:223 ../libvips/conversion/extract.c:204
-msgid "Left edge of extract area"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:229 ../libvips/conversion/extract.c:210
-msgid "Top"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:230 ../libvips/conversion/extract.c:211
-msgid "Top edge of extract area"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:236 ../libvips/conversion/extract.c:217
-#: ../libvips/conversion/black.c:128 ../libvips/conversion/copy.c:334
-#: ../libvips/conversion/embed.c:543 ../libvips/foreign/rawload.c:122
-#: ../libvips/iofuncs/image.c:876
-msgid "Width"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:237 ../libvips/conversion/extract.c:218
-msgid "Width of extract area"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:243 ../libvips/conversion/extract.c:224
-#: ../libvips/conversion/black.c:135 ../libvips/conversion/copy.c:341
-#: ../libvips/conversion/embed.c:550 ../libvips/foreign/rawload.c:129
-#: ../libvips/iofuncs/image.c:883
-msgid "Height"
-msgstr ""
-
-#: ../libvips/arithmetic/measure.c:244 ../libvips/conversion/extract.c:225
-msgid "Height of extract area"
-msgstr ""
-
-#: ../libvips/arithmetic/math2.c:198
-msgid "pow( left, right)"
-msgstr ""
-
-#: ../libvips/arithmetic/math2.c:206 ../libvips/arithmetic/math2.c:403
-#: ../libvips/arithmetic/complex.c:222 ../libvips/arithmetic/complex.c:476
-#: ../libvips/arithmetic/math.c:205 ../libvips/arithmetic/relational.c:227
-#: ../libvips/arithmetic/relational.c:560 ../libvips/arithmetic/boolean.c:217
-#: ../libvips/arithmetic/boolean.c:519
-msgid "Operation"
-msgstr ""
-
-#: ../libvips/arithmetic/math2.c:207 ../libvips/arithmetic/math2.c:404
-#: ../libvips/arithmetic/math.c:206
-msgid "math to perform"
-msgstr ""
-
-#: ../libvips/arithmetic/math2.c:395
-msgid "pow( @in, @c )"
-msgstr ""
-
-#: ../libvips/arithmetic/round.c:160
-msgid "perform a round function on an image"
-msgstr ""
-
-#: ../libvips/arithmetic/round.c:168
-msgid "Round operation"
-msgstr ""
-
-#: ../libvips/arithmetic/round.c:169
-msgid "rounding operation to perform"
-msgstr ""
-
-#: ../libvips/arithmetic/unary.c:80
-msgid "unary operations"
-msgstr ""
-
-#: ../libvips/arithmetic/unary.c:87 ../libvips/arithmetic/statistic.c:151
-#: ../libvips/conversion/flip.c:240 ../libvips/conversion/bandmean.c:197
-#: ../libvips/conversion/cast.c:479 ../libvips/conversion/flatten.c:375
-#: ../libvips/conversion/extract.c:197 ../libvips/conversion/extract.c:356
+#: ../libvips/arithmetic/statistic.c:151 ../libvips/arithmetic/unary.c:87
+#: ../libvips/colour/colour.c:267 ../libvips/colour/colour.c:393
+#: ../libvips/colour/colourspace.c:303 ../libvips/conversion/rot.c:359
+#: ../libvips/conversion/recomb.c:204 ../libvips/conversion/flatten.c:376
+#: ../libvips/conversion/replicate.c:196 ../libvips/conversion/cache.c:100
+#: ../libvips/conversion/extract.c:199 ../libvips/conversion/extract.c:359
+#: ../libvips/conversion/tilecache.c:424 ../libvips/conversion/flip.c:240
 #: ../libvips/conversion/bandjoin.c:171 ../libvips/conversion/copy.c:321
-#: ../libvips/conversion/rot.c:359 ../libvips/conversion/replicate.c:196
-<<<<<<< HEAD
-<<<<<<< HEAD
-#: ../libvips/conversion/tilecache.c:355 ../libvips/conversion/embed.c:523
-=======
-#: ../libvips/conversion/tilecache.c:357 ../libvips/conversion/embed.c:523
->>>>>>> origin/master
-=======
-#: ../libvips/conversion/tilecache.c:359 ../libvips/conversion/embed.c:523
->>>>>>> origin/7.30
-#: ../libvips/conversion/cache.c:100 ../libvips/conversion/recomb.c:203
-#: ../libvips/conversion/sequential.c:273 ../libvips/foreign/foreign.c:1413
-#: ../libvips/resample/resample.c:89
+#: ../libvips/conversion/cast.c:482 ../libvips/conversion/sequential.c:272
+#: ../libvips/conversion/embed.c:550 ../libvips/conversion/bandmean.c:197
+#: ../libvips/foreign/foreign.c:1357 ../libvips/resample/resample.c:92
 msgid "Input"
 msgstr ""
 
-#: ../libvips/arithmetic/unary.c:88 ../libvips/conversion/bandmean.c:198
-#: ../libvips/conversion/recomb.c:204 ../libvips/resample/resample.c:90
-msgid "Input image argument"
+#: ../libvips/arithmetic/statistic.c:152 ../libvips/colour/colour.c:268
+#: ../libvips/colour/colour.c:394 ../libvips/colour/colourspace.c:304
+#: ../libvips/conversion/rot.c:360 ../libvips/conversion/flatten.c:377
+#: ../libvips/conversion/replicate.c:197 ../libvips/conversion/cache.c:101
+#: ../libvips/conversion/extract.c:200 ../libvips/conversion/extract.c:360
+#: ../libvips/conversion/tilecache.c:425 ../libvips/conversion/flip.c:241
+#: ../libvips/conversion/copy.c:322 ../libvips/conversion/cast.c:483
+#: ../libvips/conversion/sequential.c:273 ../libvips/conversion/embed.c:551
+msgid "Input image"
 msgstr ""
 
-#: ../libvips/arithmetic/unaryconst.c:201
-msgid "unary operations with a constant"
-msgstr ""
-
-#: ../libvips/arithmetic/unaryconst.c:205
-msgid "c"
-msgstr ""
-
-#: ../libvips/arithmetic/unaryconst.c:206
-msgid "Array of constants"
-msgstr ""
-
-#: ../libvips/arithmetic/arithmetic.c:164
-#, c-format
-msgid "not one band or %d bands"
-msgstr ""
-
-#: ../libvips/arithmetic/arithmetic.c:168
-#: ../libvips/histograms_lut/im_identity.c:80
-#: ../libvips/histograms_lut/im_identity.c:143
-msgid "bad bands"
-msgstr ""
-
-#: ../libvips/arithmetic/arithmetic.c:324 ../libvips/conversion/bandary.c:131
-msgid "too many input images"
-msgstr ""
-
-#: ../libvips/arithmetic/arithmetic.c:379
-msgid "arithmetic operations"
-msgstr ""
-
-#: ../libvips/arithmetic/arithmetic.c:386
-#: ../libvips/conversion/conversion.c:90 ../libvips/foreign/foreign.c:927
-#: ../libvips/resample/resample.c:96
-msgid "Output image"
-msgstr ""
-
-#: ../libvips/arithmetic/min.c:317
-msgid "find image minimum"
-msgstr ""
-
-#: ../libvips/arithmetic/min.c:332 ../libvips/arithmetic/max.c:331
-#: ../libvips/conversion/embed.c:529
-msgid "x"
-msgstr ""
-
-#: ../libvips/arithmetic/min.c:333
-msgid "Horizontal position of minimum"
-msgstr ""
-
-#: ../libvips/arithmetic/min.c:339 ../libvips/arithmetic/max.c:338
-#: ../libvips/conversion/embed.c:536
-msgid "y"
-msgstr ""
-
-#: ../libvips/arithmetic/min.c:340
-msgid "Vertical position of minimum"
-msgstr ""
-
-#: ../libvips/arithmetic/im_point_bilinear.c:75
-msgid "coords outside image"
-msgstr ""
-
-#: ../libvips/arithmetic/complex.c:215
-msgid "perform a complex operation on an image"
-msgstr ""
-
-#: ../libvips/arithmetic/complex.c:223 ../libvips/arithmetic/complex.c:477
-msgid "complex to perform"
-msgstr ""
-
-#: ../libvips/arithmetic/complex.c:468
-msgid "get a component from a complex image"
-msgstr ""
-
-#: ../libvips/arithmetic/complex.c:666
-msgid "form a complex image from two real images"
-msgstr ""
-
-#: ../libvips/arithmetic/invert.c:152
-msgid "invert an image"
-msgstr ""
-
-#: ../libvips/arithmetic/remainder.c:178
-msgid "remainder after integer division of two images"
-msgstr ""
-
-#: ../libvips/arithmetic/remainder.c:327
-msgid "remainder after integer division of an image and a constant"
-msgstr ""
-
-#: ../libvips/arithmetic/math.c:197
-msgid "perform a math function on an image"
-msgstr ""
-
-#: ../libvips/arithmetic/abs.c:215
-msgid "absolute value of an image"
-msgstr ""
-
-#: ../libvips/arithmetic/relational.c:219
-msgid "a relational operation on a pair of images"
-msgstr ""
-
-#: ../libvips/arithmetic/relational.c:228
-#: ../libvips/arithmetic/relational.c:561
-msgid "relational to perform"
-msgstr ""
-
-#: ../libvips/arithmetic/relational.c:552
-msgid "relational operations against a constant"
+#: ../libvips/arithmetic/stats.c:424 ../libvips/arithmetic/measure.c:204
+msgid "Output array of statistics"
 msgstr ""
 
 #: ../libvips/arithmetic/binary.c:88
 msgid "binary operations"
 msgstr ""
 
+#: ../libvips/arithmetic/binary.c:95 ../libvips/arithmetic/measure.c:223
+#: ../libvips/colour/colour.c:562 ../libvips/conversion/extract.c:205
+msgid "Left"
+msgstr ""
+
 #: ../libvips/arithmetic/binary.c:96
 msgid "Left-hand image argument"
 msgstr ""
 
-#: ../libvips/arithmetic/binary.c:101
+#: ../libvips/arithmetic/binary.c:101 ../libvips/colour/colour.c:568
 msgid "Right"
 msgstr ""
 
@@ -551,10 +404,6 @@ msgstr ""
 msgid "Right-hand image argument"
 msgstr ""
 
-#: ../libvips/arithmetic/sign.c:151
-msgid "unit vector of pixel"
-msgstr ""
-
 #: ../libvips/arithmetic/im_maxpos_vec.c:121
 #: ../libvips/arithmetic/im_maxpos_vec.c:186
 msgid "scalar images only"
@@ -575,424 +424,423 @@ msgstr ""
 msgid "invalid argument"
 msgstr ""
 
-#: ../libvips/arithmetic/statistic.c:147
-msgid "VIPS statistic operations"
+#: ../libvips/arithmetic/relational.c:219
+msgid "a relational operation on a pair of images"
 msgstr ""
 
-#: ../libvips/arithmetic/statistic.c:152 ../libvips/conversion/flip.c:241
-#: ../libvips/conversion/cast.c:480 ../libvips/conversion/flatten.c:376
-#: ../libvips/conversion/extract.c:198 ../libvips/conversion/extract.c:357
-#: ../libvips/conversion/copy.c:322 ../libvips/conversion/rot.c:360
-<<<<<<< HEAD
-<<<<<<< HEAD
-#: ../libvips/conversion/replicate.c:197 ../libvips/conversion/tilecache.c:356
-=======
-#: ../libvips/conversion/replicate.c:197 ../libvips/conversion/tilecache.c:358
->>>>>>> origin/master
-=======
-#: ../libvips/conversion/replicate.c:197 ../libvips/conversion/tilecache.c:360
->>>>>>> origin/7.30
-#: ../libvips/conversion/embed.c:524 ../libvips/conversion/cache.c:101
-#: ../libvips/conversion/sequential.c:274
-msgid "Input image"
+#: ../libvips/arithmetic/relational.c:228
+#: ../libvips/arithmetic/relational.c:561
+msgid "relational to perform"
 msgstr ""
 
-#: ../libvips/arithmetic/boolean.c:209
+#: ../libvips/arithmetic/relational.c:552
+msgid "relational operations against a constant"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:164
+#, c-format
+msgid "patch %d x %d, band %d: avg = %g, sdev = %g"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:193
+msgid "measure a set of patches on a colour chart"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:197
+msgid "in"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:198
+msgid "Image to measure"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:209 ../libvips/conversion/replicate.c:202
+msgid "Across"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:210
+msgid "Number of patches across chart"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:216 ../libvips/conversion/replicate.c:209
+msgid "Down"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:217
+msgid "Number of patches down chart"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:224 ../libvips/conversion/extract.c:206
+msgid "Left edge of extract area"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:230 ../libvips/conversion/extract.c:212
+msgid "Top"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:231 ../libvips/conversion/extract.c:213
+msgid "Top edge of extract area"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:237 ../libvips/conversion/black.c:128
+#: ../libvips/conversion/extract.c:219 ../libvips/conversion/copy.c:334
+#: ../libvips/conversion/embed.c:570 ../libvips/foreign/rawload.c:122
+#: ../libvips/iofuncs/image.c:882
+msgid "Width"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:238 ../libvips/conversion/extract.c:220
+msgid "Width of extract area"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:244 ../libvips/conversion/black.c:135
+#: ../libvips/conversion/extract.c:226 ../libvips/conversion/copy.c:341
+#: ../libvips/conversion/embed.c:577 ../libvips/foreign/rawload.c:129
+#: ../libvips/iofuncs/image.c:889
+msgid "Height"
+msgstr ""
+
+#: ../libvips/arithmetic/measure.c:245 ../libvips/conversion/extract.c:227
+msgid "Height of extract area"
+msgstr ""
+
+#: ../libvips/arithmetic/remainder.c:179
+msgid "remainder after integer division of two images"
+msgstr ""
+
+#: ../libvips/arithmetic/remainder.c:329
+msgid "remainder after integer division of an image and a constant"
+msgstr ""
+
+#: ../libvips/arithmetic/unary.c:80
+msgid "unary operations"
+msgstr ""
+
+#: ../libvips/arithmetic/unary.c:88 ../libvips/conversion/recomb.c:205
+#: ../libvips/conversion/bandmean.c:198 ../libvips/resample/resample.c:93
+msgid "Input image argument"
+msgstr ""
+
+#: ../libvips/arithmetic/math.c:198
+msgid "perform a math function on an image"
+msgstr ""
+
+#: ../libvips/arithmetic/math.c:207 ../libvips/arithmetic/math2.c:208
+#: ../libvips/arithmetic/math2.c:406
+msgid "math to perform"
+msgstr ""
+
+#: ../libvips/arithmetic/arithmetic.c:164
+#, c-format
+msgid "not one band or %d bands"
+msgstr ""
+
+#: ../libvips/arithmetic/arithmetic.c:168
+#: ../libvips/histograms_lut/im_identity.c:80
+#: ../libvips/histograms_lut/im_identity.c:143
+msgid "bad bands"
+msgstr ""
+
+#: ../libvips/arithmetic/arithmetic.c:325 ../libvips/colour/colour.c:121
+#: ../libvips/conversion/bandary.c:134
+msgid "too many input images"
+msgstr ""
+
+#: ../libvips/arithmetic/arithmetic.c:380
+msgid "arithmetic operations"
+msgstr ""
+
+#: ../libvips/arithmetic/arithmetic.c:387 ../libvips/colour/colour.c:173
+#: ../libvips/colour/colourspace.c:310 ../libvips/conversion/conversion.c:90
+#: ../libvips/foreign/foreign.c:929 ../libvips/resample/resample.c:99
+msgid "Output image"
+msgstr ""
+
+#: ../libvips/arithmetic/math2.c:199
+msgid "pow( left, right)"
+msgstr ""
+
+#: ../libvips/arithmetic/math2.c:397
+msgid "pow( @in, @c )"
+msgstr ""
+
+#: ../libvips/arithmetic/linear.c:250
+msgid "calculate (a * in + b)"
+msgstr ""
+
+#: ../libvips/arithmetic/linear.c:258
+msgid "a"
+msgstr ""
+
+#: ../libvips/arithmetic/linear.c:259
+msgid "Multiply by this"
+msgstr ""
+
+#: ../libvips/arithmetic/linear.c:265
+msgid "b"
+msgstr ""
+
+#: ../libvips/arithmetic/linear.c:266
+msgid "Add this"
+msgstr ""
+
+#: ../libvips/arithmetic/boolean.c:210
 msgid "a boolean operation on a pair of images"
 msgstr ""
 
-#: ../libvips/arithmetic/boolean.c:218 ../libvips/arithmetic/boolean.c:520
+#: ../libvips/arithmetic/boolean.c:219 ../libvips/arithmetic/boolean.c:522
 msgid "boolean to perform"
 msgstr ""
 
-#: ../libvips/arithmetic/boolean.c:511
+#: ../libvips/arithmetic/boolean.c:513
 msgid "boolean operations against a constant"
 msgstr ""
 
-#: ../libvips/arithmetic/max.c:316
-msgid "find image maximum"
+#: ../libvips/arithmetic/sign.c:151
+msgid "unit vector of pixel"
 msgstr ""
 
-#: ../libvips/arithmetic/max.c:332
-msgid "Horizontal position of maximum"
+#: ../libvips/colour/sRGB2XYZ.c:145
+msgid "convert an sRGB image to XYZ"
 msgstr ""
 
-#: ../libvips/arithmetic/max.c:339
-msgid "Vertical position of maximum"
+#: ../libvips/colour/Lab2XYZ.c:168
+msgid "transform CIELAB to XYZ"
 msgstr ""
 
-#: ../libvips/colour/im_XYZ2disp.c:139
-msgid "3-band uncoded float only"
+#: ../libvips/colour/Lab2XYZ.c:174 ../libvips/colour/XYZ2Lab.c:232
+msgid "Temperature"
 msgstr ""
 
-#: ../libvips/colour/im_disp2XYZ.c:86
-msgid "input not 3-band uncoded char"
+#: ../libvips/colour/Lab2XYZ.c:175 ../libvips/colour/XYZ2Lab.c:233
+msgid "Colour temperature"
 msgstr ""
 
-#: ../libvips/colour/disp.c:397
-msgid "out of range [0,255]"
+#: ../libvips/colour/LCh2Lab.c:118
+msgid "transform LCh to Lab"
 msgstr ""
 
-#: ../libvips/colour/disp.c:423
-msgid "bad display type"
+#: ../libvips/colour/LCh2UCS.c:178 ../libvips/colour/UCS2LCh.c:265
+msgid "transform LCh to CMC"
 msgstr ""
 
-#: ../libvips/colour/disp.c:537
-msgid "display unknown"
+#: ../libvips/colour/dE00.c:234
+msgid "calculate dE00"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:202
-#: ../libvips/colour/im_icc_transform.c:212
-#: ../libvips/colour/im_icc_transform.c:1000
-#: ../libvips/colour/im_icc_transform.c:1010
-#, c-format
-msgid "unable to open profile \"%s\""
+#: ../libvips/colour/icc_transform.c:194 ../libvips/colour/XYZ2sRGB.c:160
+msgid "depth must be 8 or 16"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:223
-#: ../libvips/colour/im_icc_transform.c:1022
-msgid "unable to create profiles"
-msgstr ""
-
-#: ../libvips/colour/im_icc_transform.c:242
-#: ../libvips/colour/im_icc_transform.c:1042
-msgid "unable to read profile"
-msgstr ""
-
-#: ../libvips/colour/im_icc_transform.c:363
-#: ../libvips/colour/im_icc_transform.c:372
-#: ../libvips/colour/im_icc_transform.c:737
-#: ../libvips/colour/im_icc_transform.c:1170
-#: ../libvips/colour/im_icc_transform.c:1179
-#: ../libvips/colour/im_icc_transform.c:1522
-#, c-format
-msgid ""
-"intent %d (%s) not supported by profile \"%s\"; falling back to default "
-"intent (usually PERCEPTUAL)"
-msgstr ""
-
-#: ../libvips/colour/im_icc_transform.c:382
-#: ../libvips/colour/im_icc_transform.c:1189
-msgid "CMYK input profile needs a 4 band input image"
-msgstr ""
-
-#: ../libvips/colour/im_icc_transform.c:392
-#: ../libvips/colour/im_icc_transform.c:1199
-msgid "RGB input profile needs a 3 band input image"
-msgstr ""
-
-#: ../libvips/colour/im_icc_transform.c:401
-#: ../libvips/colour/im_icc_transform.c:551
-#: ../libvips/colour/im_icc_transform.c:1208
-#: ../libvips/colour/im_icc_transform.c:1340
+#: ../libvips/colour/icc_transform.c:229
 #, c-format
 msgid "unimplemented input color space 0x%x"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:428
-#: ../libvips/colour/im_icc_transform.c:767
-#: ../libvips/colour/im_icc_transform.c:1235
-#: ../libvips/colour/im_icc_transform.c:1552
+#: ../libvips/colour/icc_transform.c:271
 #, c-format
 msgid "unimplemented output color space 0x%x"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:444
-#: ../libvips/colour/im_icc_transform.c:567
-#: ../libvips/colour/im_icc_transform.c:1251
-#: ../libvips/colour/im_icc_transform.c:1356
-msgid "uchar or ushort input only"
+#: ../libvips/colour/icc_transform.c:283
+msgid "no device profile"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:516
-#: ../libvips/colour/im_icc_transform.c:1305
+#: ../libvips/colour/icc_transform.c:314
+msgid "transform using ICC profiles"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:318
+msgid "Intent"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:319
+msgid "Rendering intent"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:362
 #, c-format
 msgid ""
-"intent %d (%s) not supported by profile; falling back to default intent "
-"(usually PERCEPTUAL)"
+"intent %d (%s) not supported by %s profile; falling back to default intent"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:533
-#: ../libvips/colour/im_icc_transform.c:1322
-msgid "CMYK profile needs a 4 band input image"
+#: ../libvips/colour/icc_transform.c:366 ../libvips/iofuncs/operation.c:98
+msgid "input"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:543
-#: ../libvips/colour/im_icc_transform.c:1332
-msgid "RGB profile needs a 3 band input image"
+#: ../libvips/colour/icc_transform.c:366 ../libvips/iofuncs/operation.c:98
+msgid "output"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:634
-#: ../libvips/colour/im_icc_transform.c:1427
-msgid "no embedded profile"
+#: ../libvips/colour/icc_transform.c:400 ../libvips/colour/icc_transform.c:601
+#: ../libvips/colour/icc_transform.c:812
+msgid "unable to load embedded profile"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:726
-#: ../libvips/colour/im_icc_transform.c:1511
-msgid "unsupported bit depth"
+#: ../libvips/colour/icc_transform.c:408 ../libvips/colour/icc_transform.c:609
+#: ../libvips/colour/icc_transform.c:820 ../libvips/colour/icc_transform.c:834
+#, c-format
+msgid "unable to open profile \"%s\""
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:815
-#: ../libvips/colour/im_icc_transform.c:1605
+#: ../libvips/colour/icc_transform.c:414 ../libvips/colour/icc_transform.c:826
+msgid "no input profile"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:498
+msgid "import from device with ICC profile"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:504 ../libvips/colour/icc_transform.c:896
+msgid "Embedded"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:505 ../libvips/colour/icc_transform.c:897
+msgid "Use embedded input profile, if available"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:511 ../libvips/colour/icc_transform.c:903
+msgid "Input profile"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:512 ../libvips/colour/icc_transform.c:904
+msgid "Filename to load input profile from"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:617
+msgid "no output profile"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:711
+msgid "output to device with ICC profile"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:717 ../libvips/colour/icc_transform.c:889
+msgid "Output profile"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:718 ../libvips/colour/icc_transform.c:890
+msgid "Filename to load output profile from"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:724 ../libvips/colour/icc_transform.c:910
+#: ../libvips/colour/XYZ2sRGB.c:187 ../libvips/foreign/dzsave.c:1193
+msgid "Depth"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:725 ../libvips/colour/icc_transform.c:911
+#: ../libvips/colour/XYZ2sRGB.c:188
+msgid "Output device space depth in bits"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:883
+msgid "transform between devices with ICC profiles"
+msgstr ""
+
+#: ../libvips/colour/icc_transform.c:999
+#: ../libvips/colour/icc_transform.c:1013
 msgid "unable to get media white point"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:1672
-msgid "lcms library not linked to this VIPS"
+#: ../libvips/colour/dECMC.c:60
+msgid "calculate dECMC"
 msgstr ""
 
-#: ../libvips/colour/im_icc_transform.c:1682
-#: ../libvips/colour/im_icc_transform.c:1691
-#: ../libvips/colour/im_icc_transform.c:1701
-#: ../libvips/colour/im_icc_transform.c:1710
-msgid "lmcs library not linked to this VIPS"
+#: ../libvips/colour/colour.c:166
+msgid "colour operations"
 msgstr ""
 
-#: ../libvips/colour/im_lab_morph.c:75
-msgid "bad greyscale mask size"
+#: ../libvips/colour/colour.c:263
+msgid "colour space transformations"
 msgstr ""
 
-#: ../libvips/colour/im_lab_morph.c:86
+#: ../libvips/colour/colour.c:389
+msgid "change colour coding"
+msgstr ""
+
+#: ../libvips/colour/colour.c:558
+msgid "calculate colour difference"
+msgstr ""
+
+#: ../libvips/colour/colour.c:563
+msgid "Left-hand input image"
+msgstr ""
+
+#: ../libvips/colour/colour.c:569
+msgid "Right-hand input image"
+msgstr ""
+
+#: ../libvips/colour/rad2float.c:187
+msgid "unpack Radiance coding to float RGB"
+msgstr ""
+
+#: ../libvips/colour/XYZ2sRGB.c:181
+msgid "convert an XYZ image to sRGB"
+msgstr ""
+
+#: ../libvips/colour/Lab2LabQ.c:135
+msgid "transform float Lab to LabQ coding"
+msgstr ""
+
+#: ../libvips/colour/colourspace.c:265
 #, c-format
-msgid "bad greyscale mask value, row %d"
+msgid "no known route between '%s' and '%s'"
 msgstr ""
 
-#: ../libvips/conversion/flip.c:236
-msgid "flip an image"
+#: ../libvips/colour/colourspace.c:297
+msgid "convert to a new colourspace"
 msgstr ""
 
-#: ../libvips/conversion/flip.c:246
-msgid "Direction"
+#: ../libvips/colour/colourspace.c:315
+msgid "Space"
 msgstr ""
 
-#: ../libvips/conversion/flip.c:247
-msgid "Direction to flip image"
+#: ../libvips/colour/colourspace.c:316
+msgid "Destination colour space"
 msgstr ""
 
-#: ../libvips/conversion/bandmean.c:191
-msgid "band-wise average"
+#: ../libvips/colour/Lab2LabS.c:79
+msgid "transform float Lab to signed short"
 msgstr ""
 
-#: ../libvips/conversion/im_zoom.c:331
-msgid "zoom factors should be >= 0"
+#: ../libvips/colour/LabS2LabQ.c:125
+msgid "transform short Lab to LabQ coding"
 msgstr ""
 
-#. Make sure we won't get integer overflow.
-#.
-#: ../libvips/conversion/im_zoom.c:338
-msgid "zoom factors too large"
+#: ../libvips/colour/Lab2LCh.c:131
+msgid "transform Lab to LCh"
 msgstr ""
 
-#: ../libvips/conversion/im_gaussnoise.c:124
-msgid "bad parameter"
+#: ../libvips/colour/Yxy2XYZ.c:92
+msgid "transform Yxy to XYZ"
 msgstr ""
 
-#: ../libvips/conversion/bandary.c:127
-msgid "no input images"
+#: ../libvips/colour/LabQ2sRGB.c:445 ../libvips/colour/LabQ2LabS.c:103
+msgid "unpack a LabQ image to short Lab"
 msgstr ""
 
-#: ../libvips/conversion/bandary.c:174
-msgid "operations on image bands"
+#: ../libvips/colour/float2rad.c:198
+msgid "transform float RGB to Radiance coding"
 msgstr ""
 
-#: ../libvips/conversion/cast.c:125
-#, c-format
-msgid "%d underflows and %d overflows detected"
+#: ../libvips/colour/XYZ2Yxy.c:91
+msgid "transform XYZ to Yxy"
 msgstr ""
 
-#: ../libvips/conversion/cast.c:473
-msgid "cast an image"
+#: ../libvips/colour/dE76.c:112
+msgid "calculate dE76"
 msgstr ""
 
-#: ../libvips/conversion/cast.c:485 ../libvips/conversion/copy.c:355
-#: ../libvips/iofuncs/image.c:897
-msgid "Format"
+#: ../libvips/colour/XYZ2Lab.c:226
+msgid "transform XYZ to Lab"
 msgstr ""
 
-#: ../libvips/conversion/cast.c:486
-msgid "Format to cast to"
+#: ../libvips/colour/LabQ2Lab.c:123
+msgid "unpack a LabQ image to float Lab"
 msgstr ""
 
-#: ../libvips/conversion/conversion.c:85
-msgid "conversion operations"
-msgstr ""
-
-#: ../libvips/conversion/flatten.c:369
-msgid "flatten alpha out of an image"
-msgstr ""
-
-#: ../libvips/conversion/flatten.c:381 ../libvips/conversion/join.c:266
-#: ../libvips/conversion/insert.c:392
-msgid "Background"
-msgstr ""
-
-#: ../libvips/conversion/flatten.c:382
-msgid "Background value"
-msgstr ""
-
-#: ../libvips/conversion/im_subsample.c:202
-msgid "factors should both be >= 1"
-msgstr ""
-
-#: ../libvips/conversion/im_subsample.c:221 ../libvips/resample/shrink.c:346
-msgid "image has shrunk to nothing"
-msgstr ""
-
-#: ../libvips/conversion/im_grid.c:164
-#: ../libvips/convolution/im_contrast_surface.c:140
-#: ../libvips/iofuncs/sinkscreen.c:1082 ../libvips/iofuncs/image.c:721
-#: ../libvips/morphology/im_rank.c:342
-msgid "bad parameters"
-msgstr ""
-
-#: ../libvips/conversion/im_grid.c:169
-msgid "bad grid geometry"
-msgstr ""
-
-#: ../libvips/conversion/extract.c:147
-msgid "bad extract area"
-msgstr ""
-
-#: ../libvips/conversion/extract.c:191
-msgid "extract an area from an image"
-msgstr ""
-
-#: ../libvips/conversion/extract.c:321
-msgid "bad extract band"
-msgstr ""
-
-#: ../libvips/conversion/extract.c:350
-msgid "extract band from an image"
-msgstr ""
-
-#: ../libvips/conversion/extract.c:362
-msgid "Band"
-msgstr ""
-
-#: ../libvips/conversion/extract.c:363
-msgid "Band to extract"
-msgstr ""
-
-#: ../libvips/conversion/extract.c:369
-msgid "n"
-msgstr ""
-
-#: ../libvips/conversion/extract.c:370
-msgid "Number of bands to extract"
-msgstr ""
-
-#: ../libvips/conversion/bandjoin.c:165
-msgid "bandwise join a set of images"
-msgstr ""
-
-#: ../libvips/conversion/bandjoin.c:172
-msgid "Array of input images"
-msgstr ""
-
-#: ../libvips/conversion/im_msb.c:134 ../libvips/conversion/im_msb.c:213
-msgid "unknown coding"
-msgstr ""
-
-#: ../libvips/conversion/im_msb.c:169
-msgid "bad arguments"
-msgstr ""
-
-#: ../libvips/conversion/im_msb.c:183 ../libvips/conversion/im_msb.c:200
-msgid "image does not have that many bands"
-msgstr ""
-
-#: ../libvips/conversion/black.c:124
-msgid "make a black image"
-msgstr ""
-
-#: ../libvips/conversion/black.c:129 ../libvips/conversion/copy.c:335
-#: ../libvips/conversion/embed.c:544 ../libvips/foreign/rawload.c:123
-#: ../libvips/iofuncs/image.c:877
-msgid "Image width in pixels"
-msgstr ""
-
-#: ../libvips/conversion/black.c:136 ../libvips/conversion/copy.c:342
-#: ../libvips/conversion/embed.c:551 ../libvips/foreign/rawload.c:130
-#: ../libvips/iofuncs/image.c:884
-msgid "Image height in pixels"
-msgstr ""
-
-#: ../libvips/conversion/black.c:142 ../libvips/conversion/copy.c:348
-#: ../libvips/foreign/rawload.c:136 ../libvips/iofuncs/image.c:890
-msgid "Bands"
-msgstr ""
-
-#: ../libvips/conversion/black.c:143 ../libvips/conversion/copy.c:349
-#: ../libvips/foreign/rawload.c:137 ../libvips/iofuncs/image.c:891
-msgid "Number of bands in image"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:315
-msgid "copy an image"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:327
-msgid "Swap"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:328
-msgid "Swap bytes in image between little and big-endian"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:356 ../libvips/iofuncs/image.c:898
-msgid "Pixel format in image"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:362 ../libvips/iofuncs/image.c:904
-msgid "Coding"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:363 ../libvips/iofuncs/image.c:905
-msgid "Pixel coding"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:369 ../libvips/iofuncs/image.c:911
-msgid "Interpretation"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:370 ../libvips/iofuncs/image.c:912
-msgid "Pixel interpretation"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:376 ../libvips/foreign/tiffsave.c:251
-#: ../libvips/iofuncs/image.c:918
-msgid "Xres"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:377 ../libvips/foreign/tiffsave.c:252
-#: ../libvips/iofuncs/image.c:919
-msgid "Horizontal resolution in pixels/mm"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:383 ../libvips/foreign/tiffsave.c:258
-#: ../libvips/iofuncs/image.c:925
-msgid "Yres"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:384 ../libvips/foreign/tiffsave.c:259
-#: ../libvips/iofuncs/image.c:926
-msgid "Vertical resolution in pixels/mm"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:390 ../libvips/iofuncs/image.c:932
-msgid "Xoffset"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:391 ../libvips/iofuncs/image.c:933
-msgid "Horizontal offset of origin"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:397 ../libvips/iofuncs/image.c:939
-msgid "Yoffset"
-msgstr ""
-
-#: ../libvips/conversion/copy.c:398 ../libvips/iofuncs/image.c:940
-msgid "Vertical offset of origin"
+#: ../libvips/colour/LabS2Lab.c:77
+msgid "transform signed short Lab to float"
 msgstr ""
 
 #: ../libvips/conversion/rot.c:355
@@ -1007,6 +855,40 @@ msgstr ""
 msgid "Angle to rotate image"
 msgstr ""
 
+#: ../libvips/conversion/conversion.c:85
+msgid "conversion operations"
+msgstr ""
+
+#: ../libvips/conversion/recomb.c:161
+msgid "bands in must equal matrix width"
+msgstr ""
+
+#: ../libvips/conversion/recomb.c:198
+msgid "linear recombination with matrix"
+msgstr ""
+
+#: ../libvips/conversion/recomb.c:210
+msgid "M"
+msgstr ""
+
+#: ../libvips/conversion/recomb.c:211
+msgid "matrix of coefficients"
+msgstr ""
+
+#: ../libvips/conversion/flatten.c:370
+msgid "flatten alpha out of an image"
+msgstr ""
+
+#: ../libvips/conversion/flatten.c:382 ../libvips/conversion/join.c:266
+#: ../libvips/conversion/embed.c:591 ../libvips/conversion/insert.c:393
+#: ../libvips/foreign/dzsave.c:1186
+msgid "Background"
+msgstr ""
+
+#: ../libvips/conversion/flatten.c:383
+msgid "Background value"
+msgstr ""
+
 #: ../libvips/conversion/replicate.c:192
 msgid "replicate an image"
 msgstr ""
@@ -1019,6 +901,86 @@ msgstr ""
 msgid "Repeat this many times vertically"
 msgstr ""
 
+#: ../libvips/conversion/bandary.c:129
+msgid "no input images"
+msgstr ""
+
+#: ../libvips/conversion/bandary.c:177
+msgid "operations on image bands"
+msgstr ""
+
+#: ../libvips/conversion/cache.c:96 ../libvips/conversion/tilecache.c:418
+msgid "cache an image"
+msgstr ""
+
+#: ../libvips/conversion/cache.c:106 ../libvips/conversion/tilecache.c:732
+#: ../libvips/foreign/dzsave.c:1211 ../libvips/foreign/tiffsave.c:215
+msgid "Tile width"
+msgstr ""
+
+#: ../libvips/conversion/cache.c:107 ../libvips/conversion/tilecache.c:733
+#: ../libvips/foreign/dzsave.c:1212 ../libvips/foreign/tiffsave.c:216
+msgid "Tile width in pixels"
+msgstr ""
+
+#: ../libvips/conversion/cache.c:113 ../libvips/conversion/tilecache.c:430
+#: ../libvips/conversion/sequential.c:285 ../libvips/foreign/dzsave.c:1218
+#: ../libvips/foreign/tiffsave.c:222
+msgid "Tile height"
+msgstr ""
+
+#: ../libvips/conversion/cache.c:114 ../libvips/conversion/tilecache.c:431
+#: ../libvips/conversion/sequential.c:286 ../libvips/foreign/dzsave.c:1219
+#: ../libvips/foreign/tiffsave.c:223
+msgid "Tile height in pixels"
+msgstr ""
+
+#: ../libvips/conversion/cache.c:120 ../libvips/conversion/tilecache.c:739
+msgid "Max tiles"
+msgstr ""
+
+#: ../libvips/conversion/cache.c:121 ../libvips/conversion/tilecache.c:740
+msgid "Maximum number of tiles to cache"
+msgstr ""
+
+#: ../libvips/conversion/black.c:124
+msgid "make a black image"
+msgstr ""
+
+#: ../libvips/conversion/black.c:129 ../libvips/conversion/copy.c:335
+#: ../libvips/conversion/embed.c:571 ../libvips/foreign/rawload.c:123
+#: ../libvips/iofuncs/image.c:883
+msgid "Image width in pixels"
+msgstr ""
+
+#: ../libvips/conversion/black.c:136 ../libvips/conversion/copy.c:342
+#: ../libvips/conversion/embed.c:578 ../libvips/foreign/rawload.c:130
+#: ../libvips/iofuncs/image.c:890
+msgid "Image height in pixels"
+msgstr ""
+
+#: ../libvips/conversion/black.c:142 ../libvips/conversion/copy.c:348
+#: ../libvips/foreign/rawload.c:136 ../libvips/iofuncs/image.c:896
+msgid "Bands"
+msgstr ""
+
+#: ../libvips/conversion/black.c:143 ../libvips/conversion/copy.c:349
+#: ../libvips/foreign/rawload.c:137 ../libvips/iofuncs/image.c:897
+msgid "Number of bands in image"
+msgstr ""
+
+#: ../libvips/conversion/im_msb.c:134 ../libvips/conversion/im_msb.c:213
+msgid "unknown coding"
+msgstr ""
+
+#: ../libvips/conversion/im_msb.c:169
+msgid "bad arguments"
+msgstr ""
+
+#: ../libvips/conversion/im_msb.c:183 ../libvips/conversion/im_msb.c:200
+msgid "image does not have that many bands"
+msgstr ""
+
 #: ../libvips/conversion/join.c:227
 msgid "join a pair of images"
 msgstr ""
@@ -1047,11 +1009,11 @@ msgstr ""
 msgid "Join left-right or up-down"
 msgstr ""
 
-#: ../libvips/conversion/join.c:252 ../libvips/conversion/insert.c:385
+#: ../libvips/conversion/join.c:252 ../libvips/conversion/insert.c:386
 msgid "Expand"
 msgstr ""
 
-#: ../libvips/conversion/join.c:253 ../libvips/conversion/insert.c:386
+#: ../libvips/conversion/join.c:253 ../libvips/conversion/insert.c:387
 msgid "Expand output to hold all of both inputs"
 msgstr ""
 
@@ -1063,7 +1025,7 @@ msgstr ""
 msgid "Pixels between images"
 msgstr ""
 
-#: ../libvips/conversion/join.c:267 ../libvips/conversion/insert.c:393
+#: ../libvips/conversion/join.c:267 ../libvips/conversion/insert.c:394
 msgid "Colour for new pixels"
 msgstr ""
 
@@ -1075,6 +1037,225 @@ msgstr ""
 msgid "Align on the low, centre or high coordinate edge"
 msgstr ""
 
+#: ../libvips/conversion/im_zoom.c:331
+msgid "zoom factors should be >= 0"
+msgstr ""
+
+#. Make sure we won't get integer overflow.
+#.
+#: ../libvips/conversion/im_zoom.c:338
+msgid "zoom factors too large"
+msgstr ""
+
+#: ../libvips/conversion/extract.c:149
+msgid "bad extract area"
+msgstr ""
+
+#: ../libvips/conversion/extract.c:193
+msgid "extract an area from an image"
+msgstr ""
+
+#: ../libvips/conversion/extract.c:324
+msgid "bad extract band"
+msgstr ""
+
+#: ../libvips/conversion/extract.c:353
+msgid "extract band from an image"
+msgstr ""
+
+#: ../libvips/conversion/extract.c:365
+msgid "Band"
+msgstr ""
+
+#: ../libvips/conversion/extract.c:366
+msgid "Band to extract"
+msgstr ""
+
+#: ../libvips/conversion/extract.c:372
+msgid "n"
+msgstr ""
+
+#: ../libvips/conversion/extract.c:373
+msgid "Number of bands to extract"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:470
+msgid "ifthenelse an image"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:476
+msgid "Condition"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:477
+msgid "Condition input image"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:482
+msgid "Then image"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:483
+msgid "Source for TRUE pixels"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:488
+msgid "Else image"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:489
+msgid "Source for FALSE pixels"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:494
+msgid "blend"
+msgstr ""
+
+#: ../libvips/conversion/ifthenelse.c:495
+msgid "Blend smoothly between then and else parts"
+msgstr ""
+
+#: ../libvips/conversion/tilecache.c:437
+msgid "Threaded"
+msgstr ""
+
+#: ../libvips/conversion/tilecache.c:438
+msgid "Allow threaded access"
+msgstr ""
+
+#: ../libvips/conversion/tilecache.c:444
+msgid "Strategy"
+msgstr ""
+
+#: ../libvips/conversion/tilecache.c:445
+msgid "Expected access pattern"
+msgstr ""
+
+#: ../libvips/conversion/tilecache.c:728
+msgid "cache an image as a set of tiles"
+msgstr ""
+
+#: ../libvips/conversion/tilecache.c:896
+msgid "cache an image as a set of lines"
+msgstr ""
+
+#: ../libvips/conversion/flip.c:236
+msgid "flip an image"
+msgstr ""
+
+#: ../libvips/conversion/flip.c:246
+msgid "Direction"
+msgstr ""
+
+#: ../libvips/conversion/flip.c:247
+msgid "Direction to flip image"
+msgstr ""
+
+#: ../libvips/conversion/conver_dispatch.c:918
+#: ../libvips/inplace/inplace_dispatch.c:171
+msgid "vectors not same length"
+msgstr ""
+
+#: ../libvips/conversion/bandjoin.c:165
+msgid "bandwise join a set of images"
+msgstr ""
+
+#: ../libvips/conversion/bandjoin.c:172
+msgid "Array of input images"
+msgstr ""
+
+#: ../libvips/conversion/im_grid.c:164
+#: ../libvips/convolution/im_contrast_surface.c:140
+#: ../libvips/iofuncs/image.c:727 ../libvips/iofuncs/sinkscreen.c:1062
+#: ../libvips/morphology/im_rank.c:342
+msgid "bad parameters"
+msgstr ""
+
+#: ../libvips/conversion/im_grid.c:169
+msgid "bad grid geometry"
+msgstr ""
+
+#: ../libvips/conversion/im_subsample.c:202
+msgid "factors should both be >= 1"
+msgstr ""
+
+#: ../libvips/conversion/im_subsample.c:221 ../libvips/resample/shrink.c:351
+msgid "image has shrunk to nothing"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:315
+msgid "copy an image"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:327
+msgid "Swap"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:328
+msgid "Swap bytes in image between little and big-endian"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:355 ../libvips/conversion/cast.c:488
+#: ../libvips/iofuncs/image.c:903
+msgid "Format"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:356 ../libvips/iofuncs/image.c:904
+msgid "Pixel format in image"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:362 ../libvips/iofuncs/image.c:910
+msgid "Coding"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:363 ../libvips/iofuncs/image.c:911
+msgid "Pixel coding"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:369 ../libvips/iofuncs/image.c:917
+msgid "Interpretation"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:370 ../libvips/iofuncs/image.c:918
+msgid "Pixel interpretation"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:376 ../libvips/foreign/tiffsave.c:251
+#: ../libvips/iofuncs/image.c:924
+msgid "Xres"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:377 ../libvips/foreign/tiffsave.c:252
+#: ../libvips/iofuncs/image.c:925
+msgid "Horizontal resolution in pixels/mm"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:383 ../libvips/foreign/tiffsave.c:258
+#: ../libvips/iofuncs/image.c:931
+msgid "Yres"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:384 ../libvips/foreign/tiffsave.c:259
+#: ../libvips/iofuncs/image.c:932
+msgid "Vertical resolution in pixels/mm"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:390 ../libvips/iofuncs/image.c:938
+msgid "Xoffset"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:391 ../libvips/iofuncs/image.c:939
+msgid "Horizontal offset of origin"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:397 ../libvips/iofuncs/image.c:945
+msgid "Yoffset"
+msgstr ""
+
+#: ../libvips/conversion/copy.c:398 ../libvips/iofuncs/image.c:946
+msgid "Vertical offset of origin"
+msgstr ""
+
 #: ../libvips/conversion/im_text.c:132
 msgid "no text to render"
 msgstr ""
@@ -1087,153 +1268,57 @@ msgstr ""
 msgid "pangoft2 support disabled"
 msgstr ""
 
-#: ../libvips/conversion/conver_dispatch.c:918
-#: ../libvips/inplace/inplace_dispatch.c:171
-msgid "vectors not same length"
+#: ../libvips/conversion/cast.c:127
+#, c-format
+msgid "%d underflows and %d overflows detected"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:353
-msgid "insert an image"
+#: ../libvips/conversion/cast.c:476
+msgid "cast an image"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:359
-msgid "Main"
+#: ../libvips/conversion/cast.c:489
+msgid "Format to cast to"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:360
-msgid "Main input image"
+#: ../libvips/conversion/sequential.c:268
+msgid "check sequential access"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:365
-msgid "Sub-image"
+#: ../libvips/conversion/sequential.c:278
+msgid "trace"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:366
-msgid "Sub-image to insert into main image"
+#: ../libvips/conversion/sequential.c:279
+msgid "trace pixel requests"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:371
-msgid "X"
+#: ../libvips/conversion/embed.c:461 ../libvips/iofuncs/image.c:1870
+msgid "bad dimensions"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:372
-msgid "Left edge of sub in main"
+#: ../libvips/conversion/embed.c:544
+msgid "embed an image in a larger image"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:378
-msgid "Y"
+#: ../libvips/conversion/embed.c:557
+msgid "Left edge of input in output"
 msgstr ""
 
-#: ../libvips/conversion/insert.c:379
-msgid "Top edge of sub in main"
+#: ../libvips/conversion/embed.c:564
+msgid "Top edge of input in output"
 msgstr ""
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-#: ../libvips/conversion/tilecache.c:351 ../libvips/conversion/cache.c:96
-msgid "cache an image"
+#: ../libvips/conversion/embed.c:584
+msgid "Extend"
 msgstr ""
 
-#: ../libvips/conversion/tilecache.c:361 ../libvips/conversion/cache.c:113
-#: ../libvips/conversion/sequential.c:286 ../libvips/foreign/tiffsave.c:222
-#: ../libvips/foreign/dzsave.c:896
-msgid "Tile height"
+#: ../libvips/conversion/embed.c:585
+msgid "How to generate the extra pixels"
 msgstr ""
 
-#: ../libvips/conversion/tilecache.c:362 ../libvips/conversion/cache.c:114
-#: ../libvips/conversion/sequential.c:287 ../libvips/foreign/tiffsave.c:223
-#: ../libvips/foreign/dzsave.c:897
-msgid "Tile height in pixels"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:368
-msgid "Strategy"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:369
-msgid "Expected access pattern"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:538
-msgid "cache an image as a set of tiles"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:542 ../libvips/conversion/cache.c:106
-#: ../libvips/foreign/tiffsave.c:215 ../libvips/foreign/dzsave.c:889
-msgid "Tile width"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:543 ../libvips/conversion/cache.c:107
-#: ../libvips/foreign/tiffsave.c:216 ../libvips/foreign/dzsave.c:890
-msgid "Tile width in pixels"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:549 ../libvips/conversion/cache.c:120
-msgid "Max tiles"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:550 ../libvips/conversion/cache.c:121
-msgid "Maximum number of tiles to cache"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:699
-=======
-#: ../libvips/conversion/tilecache.c:353 ../libvips/conversion/cache.c:96
-=======
-#: ../libvips/conversion/tilecache.c:355 ../libvips/conversion/cache.c:96
->>>>>>> origin/7.30
-msgid "cache an image"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:365 ../libvips/conversion/cache.c:113
-#: ../libvips/conversion/sequential.c:286 ../libvips/foreign/tiffsave.c:222
-#: ../libvips/foreign/dzsave.c:927
-msgid "Tile height"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:366 ../libvips/conversion/cache.c:114
-#: ../libvips/conversion/sequential.c:287 ../libvips/foreign/tiffsave.c:223
-#: ../libvips/foreign/dzsave.c:928
-msgid "Tile height in pixels"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:372
-msgid "Strategy"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:373
-msgid "Expected access pattern"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:542
-msgid "cache an image as a set of tiles"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:546 ../libvips/conversion/cache.c:106
-#: ../libvips/foreign/tiffsave.c:215 ../libvips/foreign/dzsave.c:920
-msgid "Tile width"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:547 ../libvips/conversion/cache.c:107
-#: ../libvips/foreign/tiffsave.c:216 ../libvips/foreign/dzsave.c:921
-msgid "Tile width in pixels"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:553 ../libvips/conversion/cache.c:120
-msgid "Max tiles"
-msgstr ""
-
-#: ../libvips/conversion/tilecache.c:554 ../libvips/conversion/cache.c:121
-msgid "Maximum number of tiles to cache"
-msgstr ""
-
-<<<<<<< HEAD
-#: ../libvips/conversion/tilecache.c:706
->>>>>>> origin/master
-=======
-#: ../libvips/conversion/tilecache.c:709
->>>>>>> origin/7.30
-msgid "cache an image as a set of lines"
+#: ../libvips/conversion/embed.c:592 ../libvips/foreign/dzsave.c:1187
+msgid "Colour for background pixels"
 msgstr ""
 
 #: ../libvips/conversion/im_system_image.c:76
@@ -1241,111 +1326,48 @@ msgstr ""
 msgid "command failed: \"%s\""
 msgstr ""
 
-#: ../libvips/conversion/embed.c:434 ../libvips/iofuncs/image.c:1864
-msgid "bad dimensions"
+#: ../libvips/conversion/insert.c:354
+msgid "insert an image"
 msgstr ""
 
-#: ../libvips/conversion/embed.c:517
-msgid "embed an image in a larger image"
+#: ../libvips/conversion/insert.c:360
+msgid "Main"
 msgstr ""
 
-#: ../libvips/conversion/embed.c:530
-msgid "Left edge of input in output"
+#: ../libvips/conversion/insert.c:361
+msgid "Main input image"
 msgstr ""
 
-#: ../libvips/conversion/embed.c:537
-msgid "Top edge of input in output"
+#: ../libvips/conversion/insert.c:366
+msgid "Sub-image"
 msgstr ""
 
-#: ../libvips/conversion/embed.c:557
-msgid "Extend"
+#: ../libvips/conversion/insert.c:367
+msgid "Sub-image to insert into main image"
 msgstr ""
 
-#: ../libvips/conversion/embed.c:558
-msgid "How to generate the extra pixels"
+#: ../libvips/conversion/insert.c:372
+msgid "X"
 msgstr ""
 
-#: ../libvips/conversion/ifthenelse.c:469
-msgid "ifthenelse an image"
+#: ../libvips/conversion/insert.c:373
+msgid "Left edge of sub in main"
 msgstr ""
 
-#: ../libvips/conversion/ifthenelse.c:475
-msgid "Condition"
+#: ../libvips/conversion/insert.c:379
+msgid "Y"
 msgstr ""
 
-#: ../libvips/conversion/ifthenelse.c:476
-msgid "Condition input image"
+#: ../libvips/conversion/insert.c:380
+msgid "Top edge of sub in main"
 msgstr ""
 
-#: ../libvips/conversion/ifthenelse.c:481
-msgid "Then image"
+#: ../libvips/conversion/im_gaussnoise.c:124
+msgid "bad parameter"
 msgstr ""
 
-#: ../libvips/conversion/ifthenelse.c:482
-msgid "Source for TRUE pixels"
-msgstr ""
-
-#: ../libvips/conversion/ifthenelse.c:487
-msgid "Else image"
-msgstr ""
-
-#: ../libvips/conversion/ifthenelse.c:488
-msgid "Source for FALSE pixels"
-msgstr ""
-
-#: ../libvips/conversion/ifthenelse.c:493
-msgid "blend"
-msgstr ""
-
-#: ../libvips/conversion/ifthenelse.c:494
-msgid "Blend smoothly between then and else parts"
-msgstr ""
-
-#: ../libvips/conversion/recomb.c:160
-msgid "bands in must equal matrix width"
-msgstr ""
-
-#: ../libvips/conversion/recomb.c:197
-msgid "linear recombination with matrix"
-msgstr ""
-
-#: ../libvips/conversion/recomb.c:209
-msgid "M"
-msgstr ""
-
-#: ../libvips/conversion/recomb.c:210
-msgid "matrix of coefficients"
-msgstr ""
-
-#: ../libvips/conversion/sequential.c:269
-msgid "check sequential access"
-msgstr ""
-
-#: ../libvips/conversion/sequential.c:279
-msgid "trace"
-msgstr ""
-
-#: ../libvips/conversion/sequential.c:280
-msgid "trace pixel requests"
-msgstr ""
-
-#: ../libvips/convolution/im_conv.c:215
-#, c-format
-msgid "%d overflows and %d underflows detected"
-msgstr ""
-
-#: ../libvips/convolution/im_conv.c:1038
-#: ../libvips/convolution/im_conv_f.c:340
-#: ../libvips/convolution/im_aconvsep.c:798
-#: ../libvips/convolution/im_aconv.c:980
-#: ../libvips/convolution/im_aconv.c:1201
-#: ../libvips/morphology/morphology.c:721
-msgid "image too small for mask"
-msgstr ""
-
-#: ../libvips/convolution/im_conv.c:1125
-#: ../libvips/convolution/im_conv_f.c:403
-msgid "expect 1xN or Nx1 input mask"
+#: ../libvips/conversion/bandmean.c:191
+msgid "band-wise average"
 msgstr ""
 
 #: ../libvips/convolution/im_fastcor.c:134
@@ -1353,48 +1375,127 @@ msgstr ""
 msgid "ref not smaller than or equal to in"
 msgstr ""
 
-#: ../libvips/convolution/im_contrast_surface.c:147
-msgid "parameters would result in zero size output image"
-msgstr ""
-
-#: ../libvips/convolution/im_aconvsep.c:130
 #: ../libvips/convolution/im_aconv.c:223 ../libvips/convolution/im_aconv.c:229
 #: ../libvips/convolution/im_aconv.c:750
+#: ../libvips/convolution/im_aconvsep.c:130
 msgid "mask too complex"
 msgstr ""
 
+#: ../libvips/convolution/im_aconv.c:980
+#: ../libvips/convolution/im_aconv.c:1201
+#: ../libvips/convolution/im_conv.c:1038
+#: ../libvips/convolution/im_aconvsep.c:798
+#: ../libvips/convolution/im_conv_f.c:340
+#: ../libvips/morphology/morphology.c:721
+msgid "image too small for mask"
+msgstr ""
+
 #: ../libvips/convolution/im_sharpen.c:325
 #: ../libvips/histograms_lut/im_stdif.c:196
 msgid "parameters out of range"
 msgstr ""
 
-#: ../libvips/foreign/rawsave.c:159
-msgid "save image to raw file"
+#: ../libvips/convolution/im_conv.c:215
+#, c-format
+msgid "%d overflows and %d underflows detected"
 msgstr ""
 
-#: ../libvips/foreign/rawsave.c:166 ../libvips/foreign/radload.c:126
-#: ../libvips/foreign/tiffload.c:142 ../libvips/foreign/ppmsave.c:118
-#: ../libvips/foreign/vipsload.c:133 ../libvips/foreign/pngload.c:136
-#: ../libvips/foreign/openexrload.c:137 ../libvips/foreign/tiffsave.c:171
-#: ../libvips/foreign/analyzeload.c:126 ../libvips/foreign/jpegsave.c:193
-#: ../libvips/foreign/fitsload.c:116 ../libvips/foreign/ppmload.c:126
-#: ../libvips/foreign/csvload.c:132 ../libvips/foreign/magickload.c:146
-#: ../libvips/foreign/openslideload.c:178 ../libvips/foreign/csvsave.c:121
-#: ../libvips/foreign/jpegload.c:245 ../libvips/foreign/rawload.c:115
-#: ../libvips/foreign/matload.c:128 ../libvips/foreign/fitssave.c:128
-#: ../libvips/foreign/radsave.c:119 ../libvips/foreign/vipssave.c:125
-#: ../libvips/foreign/pngsave.c:168 ../libvips/iofuncs/image.c:946
+#: ../libvips/convolution/im_conv.c:1125
+#: ../libvips/convolution/im_conv_f.c:403
+msgid "expect 1xN or Nx1 input mask"
+msgstr ""
+
+#: ../libvips/convolution/im_contrast_surface.c:147
+msgid "parameters would result in zero size output image"
+msgstr ""
+
+#: ../libvips/foreign/jpeg2vips.c:171
+#, c-format
+msgid "read gave %ld warnings"
+msgstr ""
+
+#: ../libvips/foreign/jpeg2vips.c:511
+msgid "error reading resolution"
+msgstr ""
+
+#: ../libvips/foreign/jpeg2vips.c:541 ../libvips/foreign/vips2jpeg.c:479
+msgid "unknown EXIF resolution unit"
+msgstr ""
+
+#: ../libvips/foreign/jpeg2vips.c:754
+msgid "unknown JFIF resolution unit"
+msgstr ""
+
+#: ../libvips/foreign/radiance.c:885
+msgid "error reading radiance header"
+msgstr ""
+
+#: ../libvips/foreign/radiance.c:959 ../libvips/foreign/tiff2vips.c:1355
+msgid "read error"
+msgstr ""
+
+#: ../libvips/foreign/vips2jpeg.c:139
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: ../libvips/foreign/vips2jpeg.c:493
+msgid "error setting JPEG resolution"
+msgstr ""
+
+#: ../libvips/foreign/vips2jpeg.c:513
+msgid "error setting JPEG dimensions"
+msgstr ""
+
+#: ../libvips/foreign/vips2jpeg.c:668
+msgid "error saving EXIF"
+msgstr ""
+
+#: ../libvips/foreign/openexrload.c:125
+msgid "load an OpenEXR image"
+msgstr ""
+
+#: ../libvips/foreign/openexrload.c:137 ../libvips/foreign/vipssave.c:122
+#: ../libvips/foreign/rawsave.c:166 ../libvips/foreign/csvsave.c:121
+#: ../libvips/foreign/radsave.c:119 ../libvips/foreign/rawload.c:115
+#: ../libvips/foreign/csvload.c:132 ../libvips/foreign/jpegload.c:245
+#: ../libvips/foreign/magickload.c:146 ../libvips/foreign/matload.c:128
+#: ../libvips/foreign/jpegsave.c:193 ../libvips/foreign/ppmsave.c:118
+#: ../libvips/foreign/tiffsave.c:171 ../libvips/foreign/fitssave.c:128
+#: ../libvips/foreign/pngload.c:136 ../libvips/foreign/fitsload.c:116
+#: ../libvips/foreign/vipsload.c:133 ../libvips/foreign/tiffload.c:149
+#: ../libvips/foreign/analyzeload.c:126 ../libvips/foreign/openslideload.c:175
+#: ../libvips/foreign/pngsave.c:168 ../libvips/foreign/radload.c:126
+#: ../libvips/foreign/ppmload.c:126 ../libvips/iofuncs/image.c:952
 msgid "Filename"
 msgstr ""
 
-#: ../libvips/foreign/rawsave.c:167 ../libvips/foreign/ppmsave.c:119
-#: ../libvips/foreign/tiffsave.c:172 ../libvips/foreign/jpegsave.c:194
-#: ../libvips/foreign/csvsave.c:122 ../libvips/foreign/fitssave.c:129
-#: ../libvips/foreign/radsave.c:120 ../libvips/foreign/vipssave.c:126
+#: ../libvips/foreign/openexrload.c:138 ../libvips/foreign/rawload.c:116
+#: ../libvips/foreign/csvload.c:133 ../libvips/foreign/jpegload.c:246
+#: ../libvips/foreign/magickload.c:147 ../libvips/foreign/matload.c:129
+#: ../libvips/foreign/pngload.c:137 ../libvips/foreign/fitsload.c:117
+#: ../libvips/foreign/vipsload.c:134 ../libvips/foreign/tiffload.c:150
+#: ../libvips/foreign/analyzeload.c:127 ../libvips/foreign/openslideload.c:176
+#: ../libvips/foreign/radload.c:127 ../libvips/foreign/ppmload.c:127
+msgid "Filename to load from"
+msgstr ""
+
+#: ../libvips/foreign/vipssave.c:111
+msgid "save image to vips file"
+msgstr ""
+
+#: ../libvips/foreign/vipssave.c:123 ../libvips/foreign/rawsave.c:167
+#: ../libvips/foreign/csvsave.c:122 ../libvips/foreign/radsave.c:120
+#: ../libvips/foreign/jpegsave.c:194 ../libvips/foreign/ppmsave.c:119
+#: ../libvips/foreign/tiffsave.c:172 ../libvips/foreign/fitssave.c:129
 #: ../libvips/foreign/pngsave.c:169
 msgid "Filename to save to"
 msgstr ""
 
+#: ../libvips/foreign/rawsave.c:159
+msgid "save image to raw file"
+msgstr ""
+
 #: ../libvips/foreign/rawsave.c:266
 msgid "write raw image to file descriptor"
 msgstr ""
@@ -1407,29 +1508,660 @@ msgstr ""
 msgid "File descriptor to write to"
 msgstr ""
 
-#: ../libvips/foreign/radload.c:114
-msgid "load a Radiance image from a file"
+#: ../libvips/foreign/csvsave.c:112
+msgid "save image to csv file"
 msgstr ""
 
-#: ../libvips/foreign/radload.c:127 ../libvips/foreign/tiffload.c:143
-#: ../libvips/foreign/vipsload.c:134 ../libvips/foreign/pngload.c:137
-#: ../libvips/foreign/openexrload.c:138 ../libvips/foreign/analyzeload.c:127
-#: ../libvips/foreign/fitsload.c:117 ../libvips/foreign/ppmload.c:127
-#: ../libvips/foreign/csvload.c:133 ../libvips/foreign/magickload.c:147
-#: ../libvips/foreign/openslideload.c:179 ../libvips/foreign/jpegload.c:246
-#: ../libvips/foreign/rawload.c:116 ../libvips/foreign/matload.c:129
-msgid "Filename to load from"
+#: ../libvips/foreign/csvsave.c:128 ../libvips/foreign/csvload.c:160
+msgid "Separator"
 msgstr ""
 
-#: ../libvips/foreign/tiffload.c:130
+#: ../libvips/foreign/csvsave.c:129
+msgid "Separator characters"
+msgstr ""
+
+#: ../libvips/foreign/radsave.c:108
+msgid "save image to Radiance file"
+msgstr ""
+
+#: ../libvips/foreign/rawload.c:107
+msgid "load raw data from a file"
+msgstr ""
+
+#: ../libvips/foreign/rawload.c:143 ../libvips/iofuncs/image.c:980
+msgid "Size of header"
+msgstr ""
+
+#: ../libvips/foreign/rawload.c:144 ../libvips/iofuncs/image.c:981
+msgid "Offset in bytes from start of file"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:278
+#, c-format
+msgid "unable to open \"%s\" for output"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:294 ../libvips/foreign/tiff2vips.c:1494
+#, c-format
+msgid "unable to open \"%s\" for input"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:705
+msgid "layer buffer exhausted -- try making TIFF output tiles smaller"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:936
+msgid "TIFF write tile failed"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:1012
+msgid "internal error #9876345"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:1281
+msgid "tile size not a multiple of 16"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:1287
+msgid "can't have strip pyramid -- enabling tiling"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:1298
+msgid "can only pyramid LABQ and non-complex images"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:1315
+msgid "can't have 1-bit JPEG -- disabling JPEG"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:1507
+msgid "unsigned 8-bit int, 16-bit int, and 32-bit float only"
+msgstr ""
+
+#: ../libvips/foreign/vips2tiff.c:1514
+msgid "1 to 5 bands only"
+msgstr ""
+
+#: ../libvips/foreign/fits.c:178 ../libvips/foreign/matlab.c:106
+#: ../libvips/iofuncs/vips.c:147 ../libvips/mosaicing/global_balance.c:1187
+#: ../libvips/mosaicing/global_balance.c:1522
+#, c-format
+msgid "unable to open \"%s\""
+msgstr ""
+
+#: ../libvips/foreign/fits.c:240
+msgid "dimensions above 3 must be size 1"
+msgstr ""
+
+#: ../libvips/foreign/fits.c:256
+#, c-format
+msgid "bad number of axis %d"
+msgstr ""
+
+#: ../libvips/foreign/fits.c:272
+#, c-format
+msgid "unsupported bitpix %d\n"
+msgstr ""
+
+#: ../libvips/foreign/fits.c:576 ../libvips/iofuncs/vips.c:175
+#, c-format
+msgid "unable to write to \"%s\""
+msgstr ""
+
+#: ../libvips/foreign/fits.c:637
+#, c-format
+msgid "unsupported BandFmt %d\n"
+msgstr ""
+
+#: ../libvips/foreign/matlab.c:114
+#, c-format
+msgid "no matrix variables in \"%s\""
+msgstr ""
+
+#: ../libvips/foreign/matlab.c:175
+#, c-format
+msgid "unsupported rank %d\n"
+msgstr ""
+
+#: ../libvips/foreign/matlab.c:188
+#, c-format
+msgid "unsupported class type %d\n"
+msgstr ""
+
+#: ../libvips/foreign/matlab.c:236
+msgid "Mat_VarReadDataAll failed"
+msgstr ""
+
+#: ../libvips/foreign/csvload.c:121
+msgid "load csv from file"
+msgstr ""
+
+#: ../libvips/foreign/csvload.c:139
+msgid "Skip"
+msgstr ""
+
+#: ../libvips/foreign/csvload.c:140
+msgid "Skip this many lines at the start of the file"
+msgstr ""
+
+#: ../libvips/foreign/csvload.c:146
+msgid "Lines"
+msgstr ""
+
+#: ../libvips/foreign/csvload.c:147
+msgid "Read this many lines from the file"
+msgstr ""
+
+#: ../libvips/foreign/csvload.c:153
+msgid "Whitespace"
+msgstr ""
+
+#: ../libvips/foreign/csvload.c:154
+msgid "Set of whitespace characters"
+msgstr ""
+
+#: ../libvips/foreign/csvload.c:161
+msgid "Set of separator characters"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:118
+#, c-format
+msgid "bad shrink factor %d"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:140
+msgid "load jpeg"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:146
+msgid "Shrink"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:147
+msgid "Shrink factor on load"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:153
+msgid "Fail"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:154
+msgid "Fail on first warning"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:234
+msgid "load jpeg from file"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:309
+msgid "load jpeg from buffer"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:315 ../libvips/foreign/jpegsave.c:260
+#: ../libvips/foreign/pngsave.c:230
+msgid "Buffer"
+msgstr ""
+
+#: ../libvips/foreign/jpegload.c:316
+msgid "Buffer to load from"
+msgstr ""
+
+#: ../libvips/foreign/magickload.c:131
+msgid "load file with ImageMagick"
+msgstr ""
+
+#: ../libvips/foreign/matload.c:116
+msgid "load mat from file"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:279 ../libvips/foreign/tiff2vips.c:297
+#, c-format
+msgid "required field %d missing"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:317
+#, c-format
+msgid "required field %d = %d, not %d"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:661
+#, c-format
+msgid "%d bits per sample palette image not supported"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:670
+msgid "bad colormap"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:727 ../libvips/foreign/tiff2vips.c:758
+msgid "3 or 4 bands RGB TIFF only"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:829
+msgid "4 or 5 bands CMYK TIFF only"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:880
+msgid "unknown resolution unit"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:885
+#, c-format
+msgid ""
+"no resolution information for TIFF image \"%s\" -- defaulting to 1 pixel per "
+"mm"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:917
+msgid "not a PLANARCONFIG_CONTIG image"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:963
+#, c-format
+msgid "unsupported sample format %d for lab image"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:973
+#, c-format
+msgid "unsupported depth %d for LAB image"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:1012
+#, c-format
+msgid "unsupported sample format %d for greyscale image"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:1021
+#, c-format
+msgid "unsupported depth %d for greyscale image"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:1069
+#, c-format
+msgid "unsupported sample format %d for rgb image"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:1078
+#, c-format
+msgid "unsupported depth %d for RGB image"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:1092
+#, c-format
+msgid "unknown photometric interpretation %d"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:1473
+#, c-format
+msgid "bad page number %d"
+msgstr ""
+
+#: ../libvips/foreign/tiff2vips.c:1547 ../libvips/foreign/tiff2vips.c:1576
+#, c-format
+msgid "TIFF file does not contain page %d"
+msgstr ""
+
+#: ../libvips/foreign/openexr2vips.c:115
+#, c-format
+msgid "EXR error: %s"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:387
+msgid "load and save image files"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:528 ../libvips/mosaicing/im_remosaic.c:76
+#, c-format
+msgid "file \"%s\" not found"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:537 ../libvips/foreign/foreign.c:1026
+#, c-format
+msgid "\"%s\" is not a known file format"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:747
+msgid "images do not match"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:840
+msgid ""
+"VIPS_FOREIGN_PARTIAL and VIPS_FOREIGN_SEQUENTIAL both set -- using SEQUENTIAL"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:923
+msgid "file loaders"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:934
+msgid "Flags"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:935
+msgid "Flags for this file"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:941
+msgid "Disc"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:942
+msgid "Open to disc"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:948
+msgid "Sequential"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:949
+msgid "Sequential read only"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:1340
+msgid "file savers"
+msgstr ""
+
+#: ../libvips/foreign/foreign.c:1358
+msgid "Image to save"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:118
+msgid "save jpeg"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:124 ../libvips/foreign/tiffsave.c:186
+msgid "Q"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:125 ../libvips/foreign/tiffsave.c:187
+msgid "Q factor"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:131 ../libvips/foreign/tiffsave.c:201
+msgid "profile"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:132 ../libvips/foreign/tiffsave.c:202
+msgid "ICC profile to embed"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:187
+msgid "save image to jpeg file"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:256
+msgid "save image to jpeg buffer"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:261 ../libvips/foreign/pngsave.c:231
+msgid "Buffer to save to"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:303
+msgid "error writing output"
+msgstr ""
+
+#: ../libvips/foreign/jpegsave.c:319
+msgid "save image to jpeg mime"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:301
+#, c-format
+msgid "Directory \"%s\" exists"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1052
+msgid "overlap must be less than tile width and height"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1140
+msgid "save image to deep zoom format"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1150 ../libvips/foreign/dzsave.c:1204
+msgid "Base name"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1151 ../libvips/foreign/dzsave.c:1205
+msgid "Base name to save to"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1157
+msgid "Layout"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1158
+msgid "Directory layout"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1165
+msgid "suffix"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1166
+msgid "Filename suffix for tiles"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1172
+msgid "Overlap"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1173
+msgid "Tile overlap in pixels"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1179
+msgid "Tile size"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1180
+msgid "Tile size in pixels"
+msgstr ""
+
+#: ../libvips/foreign/dzsave.c:1194
+msgid "Pyramid depth"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:150
+msgid "invalid associated image name"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:167
+msgid "specify only one of level or associated image"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:188
+msgid "unsupported slide format"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:195
+#, c-format
+msgid "opening slide: %s"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:202
+msgid "invalid slide level"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:249
+#, c-format
+msgid "getting dimensions: %s"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:256
+msgid "image dimensions overflow int"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:327
+#, c-format
+msgid "reading region: %s"
+msgstr ""
+
+#: ../libvips/foreign/openslide2vips.c:424
+#, c-format
+msgid "reading associated image: %s"
+msgstr ""
+
+#: ../libvips/foreign/analyze2vips.c:308
+msgid "header file size incorrect"
+msgstr ""
+
+#: ../libvips/foreign/analyze2vips.c:353
+msgid "header size incorrect"
+msgstr ""
+
+#: ../libvips/foreign/analyze2vips.c:371
+#, c-format
+msgid "%d-dimensional images not supported"
+msgstr ""
+
+#: ../libvips/foreign/analyze2vips.c:424
+#, c-format
+msgid "datatype %d not supported"
+msgstr ""
+
+#: ../libvips/foreign/ppmsave.c:109
+msgid "save image to ppm file"
+msgstr ""
+
+#: ../libvips/foreign/ppmsave.c:125
+msgid "ASCII"
+msgstr ""
+
+#: ../libvips/foreign/ppmsave.c:126
+msgid "save as ascii"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:161
+msgid "save image to tiff file"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:178 ../libvips/foreign/pngsave.c:105
+msgid "Compression"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:179
+msgid "Compression for this file"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:193
+msgid "predictor"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:194
+msgid "Compression prediction"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:208
+msgid "Tile"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:209
+msgid "Write a tiled tiff"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:229
+msgid "Pyramid"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:230
+msgid "Write a pyramidal tiff"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:236
+msgid "Squash"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:237
+msgid "Squash images down to 1 bit"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:243 ../libvips/foreign/tiffsave.c:244
+msgid "Resolution unit"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:265
+msgid "Bigtiff"
+msgstr ""
+
+#: ../libvips/foreign/tiffsave.c:266
+msgid "Write a bigtiff image"
+msgstr ""
+
+#: ../libvips/foreign/fitssave.c:119
+msgid "save image to fits file"
+msgstr ""
+
+#: ../libvips/foreign/csv.c:183
+#, c-format
+msgid "error parsing number, line %d, column %d"
+msgstr ""
+
+#: ../libvips/foreign/csv.c:237
+msgid "end of file while skipping start"
+msgstr ""
+
+#: ../libvips/foreign/csv.c:246 ../libvips/iofuncs/util.c:1084
+#: ../libvips/iofuncs/util.c:1090
+msgid "unable to seek"
+msgstr ""
+
+#: ../libvips/foreign/csv.c:257
+msgid "empty line"
+msgstr ""
+
+#: ../libvips/foreign/csv.c:301
+#, c-format
+msgid "unexpected EOF, line %d col %d"
+msgstr ""
+
+#: ../libvips/foreign/csv.c:307
+#, c-format
+msgid "unexpected EOL, line %d col %d"
+msgstr ""
+
+#: ../libvips/foreign/pngload.c:124
+msgid "load png from file"
+msgstr ""
+
+#: ../libvips/foreign/fitsload.c:107
+msgid "load a FITS image"
+msgstr ""
+
+#: ../libvips/foreign/vipsload.c:121
+msgid "load vips from file"
+msgstr ""
+
+#: ../libvips/foreign/vipspng.c:241
+msgid "unsupported color type"
+msgstr ""
+
+#: ../libvips/foreign/vipspng.c:350
+msgid "unable to read PNG header"
+msgstr ""
+
+#: ../libvips/foreign/vipspng.c:633
+msgid "compress should be in [0,9]"
+msgstr ""
+
+#: ../libvips/foreign/vipspng.c:730
+#, c-format
+msgid "unable to write \"%s\""
+msgstr ""
+
+#: ../libvips/foreign/vipspng.c:829
+msgid "unable to write to buffer"
+msgstr ""
+
+#: ../libvips/foreign/tiffload.c:137
 msgid "load tiff from file"
 msgstr ""
 
-#: ../libvips/foreign/tiffload.c:149
+#: ../libvips/foreign/tiffload.c:156
 msgid "Page"
 msgstr ""
 
-#: ../libvips/foreign/tiffload.c:150
+#: ../libvips/foreign/tiffload.c:157
 msgid "Load this page from the file"
 msgstr ""
 
@@ -1470,236 +2202,10 @@ msgstr ""
 msgid "bad image size"
 msgstr ""
 
-#: ../libvips/foreign/ppmsave.c:109
-msgid "save image to ppm file"
-msgstr ""
-
-#: ../libvips/foreign/ppmsave.c:125
-msgid "ASCII"
-msgstr ""
-
-#: ../libvips/foreign/ppmsave.c:126
-msgid "save as ascii"
-msgstr ""
-
-#: ../libvips/foreign/vipsload.c:121
-msgid "load vips from file"
-msgstr ""
-
-#: ../libvips/foreign/pngload.c:124
-msgid "load png from file"
-msgstr ""
-
-#: ../libvips/foreign/analyze2vips.c:308
-msgid "header file size incorrect"
-msgstr ""
-
-#: ../libvips/foreign/analyze2vips.c:353
-msgid "header size incorrect"
-msgstr ""
-
-#: ../libvips/foreign/analyze2vips.c:371
-#, c-format
-msgid "%d-dimensional images not supported"
-msgstr ""
-
-#: ../libvips/foreign/analyze2vips.c:424
-#, c-format
-msgid "datatype %d not supported"
-msgstr ""
-
-#: ../libvips/foreign/jpeg2vips.c:168
-#, c-format
-msgid "read gave %ld warnings"
-msgstr ""
-
-#: ../libvips/foreign/jpeg2vips.c:488
-msgid "error reading resolution"
-msgstr ""
-
-#: ../libvips/foreign/jpeg2vips.c:513 ../libvips/foreign/vips2jpeg.c:375
-msgid "unknown EXIF resolution unit"
-msgstr ""
-
-#: ../libvips/foreign/jpeg2vips.c:721
-msgid "unknown JFIF resolution unit"
-msgstr ""
-
-#: ../libvips/foreign/radiance.c:885
-msgid "error reading radiance header"
-msgstr ""
-
-#: ../libvips/foreign/radiance.c:959 ../libvips/foreign/tiff2vips.c:1345
-msgid "read error"
-msgstr ""
-
-#: ../libvips/foreign/openexrload.c:125
-msgid "load an OpenEXR image"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:161
-msgid "save image to tiff file"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:178 ../libvips/foreign/pngsave.c:105
-msgid "Compression"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:179
-msgid "Compression for this file"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:186 ../libvips/foreign/jpegsave.c:124
-msgid "Q"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:187 ../libvips/foreign/jpegsave.c:125
-msgid "Q factor"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:193
-msgid "predictor"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:194
-msgid "Compression prediction"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:201 ../libvips/foreign/jpegsave.c:131
-msgid "profile"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:202 ../libvips/foreign/jpegsave.c:132
-msgid "ICC profile to embed"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:208
-msgid "Tile"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:209
-msgid "Write a tiled tiff"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:229
-msgid "Pyramid"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:230
-msgid "Write a pyramidal tiff"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:236
-msgid "Squash"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:237
-msgid "Squash images down to 1 bit"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:243 ../libvips/foreign/tiffsave.c:244
-msgid "Resolution unit"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:265
-msgid "Bigtiff"
-msgstr ""
-
-#: ../libvips/foreign/tiffsave.c:266
-msgid "Write a bigtiff image"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:245
-#, c-format
-msgid "Directory \"%s_files\" exists"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:819
-msgid "overlap must be less than tile width and height"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:872
-msgid "save image to deep zoom format"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:882 ../libvips/foreign/dzsave.c:913
-msgid "Base name"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:883 ../libvips/foreign/dzsave.c:914
-msgid "Base name to save to"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:889
-msgid "suffix"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:890
-msgid "Filename suffix for tiles"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:896
-msgid "Overlap"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:897
-msgid "Tile overlap in pixels"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:903
-msgid "Tile size"
-msgstr ""
-
-#: ../libvips/foreign/dzsave.c:904
-msgid "Tile size in pixels"
-msgstr ""
-
 #: ../libvips/foreign/analyzeload.c:114
 msgid "load an Analyze6 image"
 msgstr ""
 
-#: ../libvips/foreign/jpegsave.c:118
-msgid "save jpeg"
-msgstr ""
-
-#: ../libvips/foreign/jpegsave.c:187
-msgid "save image to jpeg file"
-msgstr ""
-
-#: ../libvips/foreign/jpegsave.c:256
-msgid "save image to jpeg buffer"
-msgstr ""
-
-#: ../libvips/foreign/jpegsave.c:260 ../libvips/foreign/jpegload.c:315
-#: ../libvips/foreign/pngsave.c:230
-msgid "Buffer"
-msgstr ""
-
-#: ../libvips/foreign/jpegsave.c:261 ../libvips/foreign/pngsave.c:231
-msgid "Buffer to save to"
-msgstr ""
-
-#: ../libvips/foreign/jpegsave.c:303
-msgid "error writing output"
-msgstr ""
-
-#: ../libvips/foreign/jpegsave.c:319
-msgid "save image to jpeg mime"
-msgstr ""
-
-#: ../libvips/foreign/vips2jpeg.c:134
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: ../libvips/foreign/vips2jpeg.c:386
-msgid "error setting JPEG resolution"
-msgstr ""
-
-#: ../libvips/foreign/vips2jpeg.c:535
-msgid "error saving EXIF"
-msgstr ""
-
 #: ../libvips/foreign/ppm.c:109
 msgid "bad int"
 msgstr ""
@@ -1724,338 +2230,26 @@ msgstr ""
 msgid "binary >8 bit images must be float"
 msgstr ""
 
-#: ../libvips/foreign/fitsload.c:107
-msgid "load a FITS image"
-msgstr ""
-
-#: ../libvips/foreign/ppmload.c:114
-msgid "load ppm from file"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:121
-msgid "load csv from file"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:139
-msgid "Skip"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:140
-msgid "Skip this many lines at the start of the file"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:146
-msgid "Lines"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:147
-msgid "Read this many lines from the file"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:153
-msgid "Whitespace"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:154
-msgid "Set of whitespace characters"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:160 ../libvips/foreign/csvsave.c:128
-msgid "Separator"
-msgstr ""
-
-#: ../libvips/foreign/csvload.c:161
-msgid "Set of separator characters"
-msgstr ""
-
-#: ../libvips/foreign/magickload.c:131
-msgid "load file with ImageMagick"
-msgstr ""
-
-#: ../libvips/foreign/openslideload.c:161
+#: ../libvips/foreign/openslideload.c:158
 msgid "load file with OpenSlide"
 msgstr ""
 
-#: ../libvips/foreign/openslideload.c:185
+#: ../libvips/foreign/openslideload.c:182
 msgid "Level"
 msgstr ""
 
-#: ../libvips/foreign/openslideload.c:186
+#: ../libvips/foreign/openslideload.c:183
 msgid "Load this level from the file"
 msgstr ""
 
-#: ../libvips/foreign/openslideload.c:192
+#: ../libvips/foreign/openslideload.c:189
 msgid "Associated"
 msgstr ""
 
-#: ../libvips/foreign/openslideload.c:193
+#: ../libvips/foreign/openslideload.c:190
 msgid "Load this associated image"
 msgstr ""
 
-#: ../libvips/foreign/csvsave.c:112
-msgid "save image to csv file"
-msgstr ""
-
-#: ../libvips/foreign/csvsave.c:129
-msgid "Separator characters"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:118
-#, c-format
-msgid "bad shrink factor %d"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:140
-msgid "load jpeg"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:146
-msgid "Shrink"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:147
-msgid "Shrink factor on load"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:153
-msgid "Fail"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:154
-msgid "Fail on first warning"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:234
-msgid "load jpeg from file"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:309
-msgid "load jpeg from buffer"
-msgstr ""
-
-#: ../libvips/foreign/jpegload.c:316
-msgid "Buffer to load from"
-msgstr ""
-
-#: ../libvips/foreign/rawload.c:107
-msgid "load raw data from a file"
-msgstr ""
-
-#: ../libvips/foreign/rawload.c:143 ../libvips/iofuncs/image.c:974
-msgid "Size of header"
-msgstr ""
-
-#: ../libvips/foreign/rawload.c:144 ../libvips/iofuncs/image.c:975
-msgid "Offset in bytes from start of file"
-msgstr ""
-
-#: ../libvips/foreign/openexr2vips.c:115
-#, c-format
-msgid "EXR error: %s"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:269 ../libvips/foreign/tiff2vips.c:287
-#, c-format
-msgid "required field %d missing"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:307
-#, c-format
-msgid "required field %d = %d, not %d"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:651
-#, c-format
-msgid "%d bits per sample palette image not supported"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:660
-msgid "bad colormap"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:717 ../libvips/foreign/tiff2vips.c:748
-msgid "3 or 4 bands RGB TIFF only"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:819
-msgid "4 or 5 bands CMYK TIFF only"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:870
-msgid "unknown resolution unit"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:875
-#, c-format
-msgid ""
-"no resolution information for TIFF image \"%s\" -- defaulting to 1 pixel per "
-"mm"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:907
-msgid "not a PLANARCONFIG_CONTIG image"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:953
-#, c-format
-msgid "unsupported sample format %d for lab image"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:963
-#, c-format
-msgid "unsupported depth %d for LAB image"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:1002
-#, c-format
-msgid "unsupported sample format %d for greyscale image"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:1011
-#, c-format
-msgid "unsupported depth %d for greyscale image"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:1059
-#, c-format
-msgid "unsupported sample format %d for rgb image"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:1068
-#, c-format
-msgid "unsupported depth %d for RGB image"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:1082
-#, c-format
-msgid "unknown photometric interpretation %d"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:1463
-#, c-format
-msgid "bad page number %d"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:1484 ../libvips/foreign/vips2tiff.c:294
-#, c-format
-msgid "unable to open \"%s\" for input"
-msgstr ""
-
-#: ../libvips/foreign/tiff2vips.c:1539 ../libvips/foreign/tiff2vips.c:1569
-#, c-format
-msgid "TIFF file does not contain page %d"
-msgstr ""
-
-#: ../libvips/foreign/csv.c:183
-#, c-format
-msgid "error parsing number, line %d, column %d"
-msgstr ""
-
-#: ../libvips/foreign/csv.c:237
-msgid "end of file while skipping start"
-msgstr ""
-
-#: ../libvips/foreign/csv.c:246 ../libvips/iofuncs/util.c:1084
-#: ../libvips/iofuncs/util.c:1090
-msgid "unable to seek"
-msgstr ""
-
-#: ../libvips/foreign/csv.c:257
-msgid "empty line"
-msgstr ""
-
-#: ../libvips/foreign/csv.c:301
-#, c-format
-msgid "unexpected EOF, line %d col %d"
-msgstr ""
-
-#: ../libvips/foreign/csv.c:307
-#, c-format
-msgid "unexpected EOL, line %d col %d"
-msgstr ""
-
-#: ../libvips/foreign/matload.c:116
-msgid "load mat from file"
-msgstr ""
-
-#: ../libvips/foreign/fitssave.c:119
-msgid "save image to fits file"
-msgstr ""
-
-#: ../libvips/foreign/radsave.c:108
-msgid "save image to Radiance file"
-msgstr ""
-
-#: ../libvips/foreign/vipssave.c:114
-msgid "save image to vips file"
-msgstr ""
-
-#: ../libvips/foreign/fits.c:178 ../libvips/foreign/matlab.c:106
-#: ../libvips/iofuncs/vips.c:147 ../libvips/mosaicing/global_balance.c:1187
-#: ../libvips/mosaicing/global_balance.c:1522
-#, c-format
-msgid "unable to open \"%s\""
-msgstr ""
-
-#: ../libvips/foreign/fits.c:240
-msgid "dimensions above 3 must be size 1"
-msgstr ""
-
-#: ../libvips/foreign/fits.c:256
-#, c-format
-msgid "bad number of axis %d"
-msgstr ""
-
-#: ../libvips/foreign/fits.c:272
-#, c-format
-msgid "unsupported bitpix %d\n"
-msgstr ""
-
-#: ../libvips/foreign/fits.c:576 ../libvips/iofuncs/vips.c:175
-#, c-format
-msgid "unable to write to \"%s\""
-msgstr ""
-
-#: ../libvips/foreign/fits.c:637
-#, c-format
-msgid "unsupported BandFmt %d\n"
-msgstr ""
-
-#: ../libvips/foreign/openslide2vips.c:140
-msgid "invalid associated image name"
-msgstr ""
-
-#: ../libvips/foreign/openslide2vips.c:156
-msgid "specify only one of level or associated image"
-msgstr ""
-
-#: ../libvips/foreign/openslide2vips.c:172
-msgid "failure opening slide"
-msgstr ""
-
-#: ../libvips/foreign/openslide2vips.c:179
-msgid "invalid slide level"
-msgstr ""
-
-#: ../libvips/foreign/openslide2vips.c:209
-#, c-format
-msgid "getting dimensions: %s"
-msgstr ""
-
-#: ../libvips/foreign/openslide2vips.c:216
-msgid "image dimensions overflow int"
-msgstr ""
-
-#: ../libvips/foreign/openslide2vips.c:282
-#, c-format
-msgid "reading region: %s"
-msgstr ""
-
-#: ../libvips/foreign/openslide2vips.c:379
-#, c-format
-msgid "reading associated image: %s"
-msgstr ""
-
 #: ../libvips/foreign/pngsave.c:97
 msgid "save png"
 msgstr ""
@@ -2080,166 +2274,36 @@ msgstr ""
 msgid "save image to png buffer"
 msgstr ""
 
-#: ../libvips/foreign/vips2tiff.c:278
-#, c-format
-msgid "unable to open \"%s\" for output"
+#: ../libvips/foreign/radload.c:114
+msgid "load a Radiance image from a file"
 msgstr ""
 
-#: ../libvips/foreign/vips2tiff.c:705
-msgid "layer buffer exhausted -- try making TIFF output tiles smaller"
+#: ../libvips/foreign/ppmload.c:114
+msgid "load ppm from file"
 msgstr ""
 
-#: ../libvips/foreign/vips2tiff.c:936
-msgid "TIFF write tile failed"
+#: ../libvips/freq_filt/fmask4th.c:120 ../libvips/freq_filt/fmask4th.c:129
+#: ../libvips/freq_filt/fmask4th.c:163 ../libvips/freq_filt/fmask4th.c:172
+#: ../libvips/freq_filt/fmask4th.c:205 ../libvips/freq_filt/fmask4th.c:214
+#: ../libvips/freq_filt/fmask4th.c:252 ../libvips/freq_filt/fmask4th.c:261
+#: ../libvips/freq_filt/fmask4th.c:292 ../libvips/freq_filt/fmask4th.c:301
+#: ../libvips/freq_filt/fmask4th.c:333 ../libvips/freq_filt/fmask4th.c:342
+#: ../libvips/freq_filt/fmask4th.c:373 ../libvips/freq_filt/fmask4th.c:387
+#: ../libvips/freq_filt/fmask4th.c:423 ../libvips/freq_filt/fmask4th.c:437
+#: ../libvips/freq_filt/fmask4th.c:473 ../libvips/freq_filt/fmask4th.c:487
+#: ../libvips/freq_filt/fmask4th.c:527 ../libvips/freq_filt/fmask4th.c:541
+#: ../libvips/freq_filt/fmask4th.c:578 ../libvips/freq_filt/fmask4th.c:592
+#: ../libvips/freq_filt/fmask4th.c:629 ../libvips/freq_filt/fmask4th.c:643
+#: ../libvips/freq_filt/fmask4th.c:697 ../libvips/freq_filt/fmaskcir.c:172
+#: ../libvips/freq_filt/fmaskcir.c:228 ../libvips/freq_filt/fmaskcir.c:242
+#: ../libvips/freq_filt/fmaskcir.c:317 ../libvips/freq_filt/fmaskcir.c:321
+#: ../libvips/freq_filt/fmaskcir.c:408 ../libvips/freq_filt/fmaskcir.c:412
+#: ../libvips/freq_filt/fmaskcir.c:570 ../libvips/freq_filt/fmaskcir.c:574
+msgid "bad args"
 msgstr ""
 
-#: ../libvips/foreign/vips2tiff.c:1012
-msgid "internal error #9876345"
-msgstr ""
-
-#: ../libvips/foreign/vips2tiff.c:1281
-msgid "tile size not a multiple of 16"
-msgstr ""
-
-#: ../libvips/foreign/vips2tiff.c:1287
-msgid "can't have strip pyramid -- enabling tiling"
-msgstr ""
-
-#: ../libvips/foreign/vips2tiff.c:1298
-msgid "can only pyramid LABQ and non-complex images"
-msgstr ""
-
-#: ../libvips/foreign/vips2tiff.c:1315
-msgid "can't have 1-bit JPEG -- disabling JPEG"
-msgstr ""
-
-#: ../libvips/foreign/vips2tiff.c:1511
-msgid "unsigned 8-bit int, 16-bit int, and 32-bit float only"
-msgstr ""
-
-#: ../libvips/foreign/vips2tiff.c:1518
-msgid "1 to 5 bands only"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:386
-msgid "load and save image files"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:527 ../libvips/mosaicing/im_remosaic.c:76
-#, c-format
-msgid "file \"%s\" not found"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:536 ../libvips/foreign/foreign.c:1024
-#, c-format
-msgid "\"%s\" is not a known file format"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:746
-msgid "images do not match"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:838
-msgid ""
-"VIPS_FOREIGN_PARTIAL and VIPS_FOREIGN_SEQUENTIAL both set -- using SEQUENTIAL"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:921
-msgid "file loaders"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:932
-msgid "Flags"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:933
-msgid "Flags for this file"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:939
-msgid "Disc"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:940
-msgid "Open to disc"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:946
-msgid "Sequential"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:947
-msgid "Sequential read only"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:1396
-msgid "file savers"
-msgstr ""
-
-#: ../libvips/foreign/foreign.c:1414
-msgid "Image to save"
-msgstr ""
-
-#: ../libvips/foreign/vipspng.c:241
-msgid "unsupported color type"
-msgstr ""
-
-#: ../libvips/foreign/vipspng.c:350
-msgid "unable to read PNG header"
-msgstr ""
-
-#: ../libvips/foreign/vipspng.c:633
-msgid "compress should be in [0,9]"
-msgstr ""
-
-#: ../libvips/foreign/vipspng.c:730
-#, c-format
-msgid "unable to write \"%s\""
-msgstr ""
-
-#: ../libvips/foreign/vipspng.c:829
-msgid "unable to write to buffer"
-msgstr ""
-
-#: ../libvips/foreign/matlab.c:114
-#, c-format
-msgid "no matrix variables in \"%s\""
-msgstr ""
-
-#: ../libvips/foreign/matlab.c:175
-#, c-format
-msgid "unsupported rank %d\n"
-msgstr ""
-
-#: ../libvips/foreign/matlab.c:188
-#, c-format
-msgid "unsupported class type %d\n"
-msgstr ""
-
-#: ../libvips/foreign/matlab.c:236
-msgid "Mat_VarReadDataAll failed"
-msgstr ""
-
-#: ../libvips/freq_filt/im_fractsurf.c:72
-msgid "dimension should be in (2,3)"
-msgstr ""
-
-#: ../libvips/freq_filt/im_freq_mask.c:108
-msgid "mask sizes power of 2 only"
-msgstr ""
-
-#: ../libvips/freq_filt/im_freq_mask.c:155
-msgid "unimplemented mask type"
-msgstr ""
-
-#: ../libvips/freq_filt/im_fwfft.c:125 ../libvips/freq_filt/im_fwfft.c:241
-#: ../libvips/freq_filt/im_invfftr.c:124 ../libvips/freq_filt/im_invfft.c:105
-msgid "unable to create transform plan"
-msgstr ""
-
-#: ../libvips/freq_filt/im_fwfft.c:301 ../libvips/freq_filt/im_invfftr.c:145
-#: ../libvips/freq_filt/im_invfft.c:130
-msgid "vips configured without FFT support"
+#: ../libvips/freq_filt/fmask4th.c:791 ../libvips/freq_filt/fmaskcir.c:655
+msgid "unimplemented mask"
 msgstr ""
 
 #: ../libvips/freq_filt/fmaskcir.c:158 ../libvips/freq_filt/fmaskcir.c:303
@@ -2248,26 +2312,6 @@ msgstr ""
 msgid "bad sizes"
 msgstr ""
 
-#: ../libvips/freq_filt/fmaskcir.c:172 ../libvips/freq_filt/fmaskcir.c:228
-#: ../libvips/freq_filt/fmaskcir.c:242 ../libvips/freq_filt/fmaskcir.c:317
-#: ../libvips/freq_filt/fmaskcir.c:321 ../libvips/freq_filt/fmaskcir.c:408
-#: ../libvips/freq_filt/fmaskcir.c:412 ../libvips/freq_filt/fmaskcir.c:570
-#: ../libvips/freq_filt/fmaskcir.c:574 ../libvips/freq_filt/fmask4th.c:120
-#: ../libvips/freq_filt/fmask4th.c:129 ../libvips/freq_filt/fmask4th.c:163
-#: ../libvips/freq_filt/fmask4th.c:172 ../libvips/freq_filt/fmask4th.c:205
-#: ../libvips/freq_filt/fmask4th.c:214 ../libvips/freq_filt/fmask4th.c:252
-#: ../libvips/freq_filt/fmask4th.c:261 ../libvips/freq_filt/fmask4th.c:292
-#: ../libvips/freq_filt/fmask4th.c:301 ../libvips/freq_filt/fmask4th.c:333
-#: ../libvips/freq_filt/fmask4th.c:342 ../libvips/freq_filt/fmask4th.c:373
-#: ../libvips/freq_filt/fmask4th.c:387 ../libvips/freq_filt/fmask4th.c:423
-#: ../libvips/freq_filt/fmask4th.c:437 ../libvips/freq_filt/fmask4th.c:473
-#: ../libvips/freq_filt/fmask4th.c:487 ../libvips/freq_filt/fmask4th.c:527
-#: ../libvips/freq_filt/fmask4th.c:541 ../libvips/freq_filt/fmask4th.c:578
-#: ../libvips/freq_filt/fmask4th.c:592 ../libvips/freq_filt/fmask4th.c:629
-#: ../libvips/freq_filt/fmask4th.c:643 ../libvips/freq_filt/fmask4th.c:697
-msgid "bad args"
-msgstr ""
-
 #: ../libvips/freq_filt/fmaskcir.c:490
 msgid "bad args (f)"
 msgstr ""
@@ -2276,47 +2320,26 @@ msgstr ""
 msgid "bad args (ac)"
 msgstr ""
 
-#: ../libvips/freq_filt/fmaskcir.c:655 ../libvips/freq_filt/fmask4th.c:791
-msgid "unimplemented mask"
+#: ../libvips/freq_filt/im_fractsurf.c:72
+msgid "dimension should be in (2,3)"
 msgstr ""
 
-#: ../libvips/histograms_lut/im_buildlut.c:120
-msgid "x value not an int"
+#: ../libvips/freq_filt/im_invfft.c:105 ../libvips/freq_filt/im_invfftr.c:124
+#: ../libvips/freq_filt/im_fwfft.c:125 ../libvips/freq_filt/im_fwfft.c:241
+msgid "unable to create transform plan"
 msgstr ""
 
-#: ../libvips/histograms_lut/im_buildlut.c:133
-msgid "x range too small"
+#: ../libvips/freq_filt/im_invfft.c:130 ../libvips/freq_filt/im_invfftr.c:145
+#: ../libvips/freq_filt/im_fwfft.c:301
+msgid "vips configured without FFT support"
 msgstr ""
 
-#: ../libvips/histograms_lut/im_buildlut.c:278
-msgid "bad input matrix size"
+#: ../libvips/freq_filt/im_freq_mask.c:108
+msgid "mask sizes power of 2 only"
 msgstr ""
 
-#: ../libvips/histograms_lut/im_histnD.c:227
-#, c-format
-msgid " bins out of range [1,%d]"
-msgstr ""
-
-#: ../libvips/histograms_lut/im_stdif.c:186
-#: ../libvips/histograms_lut/im_lhisteq.c:159
-msgid "window too large"
-msgstr ""
-
-#: ../libvips/histograms_lut/im_stdif.c:191
-#: ../libvips/histograms_lut/im_lhisteq.c:164
-msgid "window too small"
-msgstr ""
-
-#: ../libvips/histograms_lut/im_invertlut.c:132
-msgid "element out of range [0,1]"
-msgstr ""
-
-#: ../libvips/histograms_lut/im_invertlut.c:287
-msgid "bad input matrix"
-msgstr ""
-
-#: ../libvips/histograms_lut/im_invertlut.c:292
-msgid "bad lut_size"
+#: ../libvips/freq_filt/im_freq_mask.c:155
+msgid "unimplemented mask type"
 msgstr ""
 
 #: ../libvips/histograms_lut/tone.c:194
@@ -2351,8 +2374,47 @@ msgstr ""
 msgid "H not in range [-30,+30]"
 msgstr ""
 
-#: ../libvips/histograms_lut/im_identity.c:139
-#: ../libvips/other/im_make_xy.c:95 ../libvips/other/im_grey.c:101
+#: ../libvips/histograms_lut/im_stdif.c:186
+#: ../libvips/histograms_lut/im_lhisteq.c:159
+msgid "window too large"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_stdif.c:191
+#: ../libvips/histograms_lut/im_lhisteq.c:164
+msgid "window too small"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_histnD.c:227
+#, c-format
+msgid " bins out of range [1,%d]"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_invertlut.c:132
+msgid "element out of range [0,1]"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_invertlut.c:287
+msgid "bad input matrix"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_invertlut.c:292
+msgid "bad lut_size"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_buildlut.c:120
+msgid "x value not an int"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_buildlut.c:133
+msgid "x range too small"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_buildlut.c:278
+msgid "bad input matrix size"
+msgstr ""
+
+#: ../libvips/histograms_lut/im_identity.c:139 ../libvips/other/im_grey.c:101
+#: ../libvips/other/im_make_xy.c:95
 msgid "bad size"
 msgstr ""
 
@@ -2373,52 +2435,37 @@ msgstr ""
 msgid "ink image not 1x1 pixels"
 msgstr ""
 
-#: ../libvips/iofuncs/operation.c:98
-msgid "input"
-msgstr ""
-
-#: ../libvips/iofuncs/operation.c:98
-msgid "output"
-msgstr ""
-
-#: ../libvips/iofuncs/operation.c:273
-msgid "operations"
-msgstr ""
-
-#: ../libvips/iofuncs/operation.c:315
-msgid "usage:"
-msgstr ""
-
-#: ../libvips/iofuncs/operation.c:329 ../libvips/iofuncs/object.c:1242
-#: ../libvips/resample/interpolate.c:612
+#: ../libvips/iofuncs/window.c:236 ../libvips/iofuncs/vips.c:984
 #, c-format
-msgid "class \"%s\" not found"
+msgid "unable to read data for \"%s\", %s"
 msgstr ""
 
-#: ../libvips/iofuncs/operation.c:706
+#: ../libvips/iofuncs/window.c:237 ../libvips/iofuncs/vips.c:780
+#: ../libvips/iofuncs/vips.c:985
+msgid "file has been truncated"
+msgstr ""
+
+#: ../libvips/iofuncs/base64.c:170
+msgid "too little data"
+msgstr ""
+
+#. We shouldn't really be used for large amounts of data.
+#.
+#: ../libvips/iofuncs/base64.c:176 ../libvips/iofuncs/base64.c:241
+msgid "too much data"
+msgstr ""
+
+#: ../libvips/iofuncs/memory.c:231
+msgid "vips_free: too many frees"
+msgstr ""
+
+#: ../libvips/iofuncs/memory.c:235
+msgid "vips_free: too much free"
+msgstr ""
+
+#: ../libvips/iofuncs/memory.c:287 ../libvips/iofuncs/memory.c:290
 #, c-format
-msgid "unknown argument '%s'"
-msgstr ""
-
-#: ../libvips/iofuncs/operation.c:824
-msgid "too few arguments"
-msgstr ""
-
-#: ../libvips/iofuncs/operation.c:947
-msgid "too many arguments"
-msgstr ""
-
-#: ../libvips/iofuncs/sinkdisc.c:121
-msgid "per-thread state for sinkdisc"
-msgstr ""
-
-#: ../libvips/iofuncs/sinkdisc.c:236 ../libvips/iofuncs/sinkscreen.c:537
-#: ../libvips/iofuncs/threadpool.c:640
-msgid "unable to create thread"
-msgstr ""
-
-#: ../libvips/iofuncs/sinkdisc.c:262 ../libvips/iofuncs/util.c:668
-msgid "write failed"
+msgid "out of memory --- size == %dMB"
 msgstr ""
 
 #: ../libvips/iofuncs/vips.c:290
@@ -2451,11 +2498,6 @@ msgstr ""
 msgid "error transforming to save format"
 msgstr ""
 
-#: ../libvips/iofuncs/vips.c:780 ../libvips/iofuncs/vips.c:985
-#: ../libvips/iofuncs/window.c:237
-msgid "file has been truncated"
-msgstr ""
-
 #: ../libvips/iofuncs/vips.c:894 ../libvips/iofuncs/vips.c:903
 #: ../libvips/iofuncs/vips.c:926
 msgid "xml save error"
@@ -2466,231 +2508,176 @@ msgstr ""
 msgid "unable to read header for \"%s\""
 msgstr ""
 
-#: ../libvips/iofuncs/vips.c:984 ../libvips/iofuncs/window.c:236
-#, c-format
-msgid "unable to read data for \"%s\", %s"
-msgstr ""
-
 #: ../libvips/iofuncs/vips.c:996
 #, c-format
 msgid "error reading XML: %s"
 msgstr ""
 
-#: ../libvips/iofuncs/sinkscreen.c:185
-msgid "per-thread state for render"
+#: ../libvips/iofuncs/init.c:403
+msgid "abort on first error or warning"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:406
+msgid "evaluate with N concurrent threads"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:409
+msgid "set tile width to N (DEBUG)"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:412
+msgid "set tile height to N (DEBUG)"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:415
+msgid "set thinstrip height to N (DEBUG)"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:418
+msgid "set fatstrip height to N (DEBUG)"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:421
+msgid "show progress feedback"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:424
+msgid "leak-check on exit"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:427
+msgid "images larger than N are decompressed to disc"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:430
+msgid "disable vectorised versions of operations"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:433
+msgid "cache at most N operations"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:436
+msgid "cache at most N bytes in memory"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:439
+msgid "allow at most N open files"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:442
+msgid "trace operation cache"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:445
+msgid "dump operation cache on exit"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:448
+msgid "print libvips version"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:471
+msgid "VIPS Options"
+msgstr ""
+
+#: ../libvips/iofuncs/init.c:471
+msgid "Show VIPS options"
 msgstr ""
 
 #: ../libvips/iofuncs/sinkmemory.c:108
 msgid "per-thread state for sinkmemory"
 msgstr ""
 
+#. File length unit.
+#.
+#: ../libvips/iofuncs/buf.c:520
+msgid "bytes"
+msgstr ""
+
+#. Kilo byte unit.
+#.
+#: ../libvips/iofuncs/buf.c:524
+msgid "KB"
+msgstr ""
+
+#. Mega byte unit.
+#.
+#: ../libvips/iofuncs/buf.c:528
+msgid "MB"
+msgstr ""
+
+#. Giga byte unit.
+#.
+#: ../libvips/iofuncs/buf.c:532
+msgid "GB"
+msgstr ""
+
+#. Tera byte unit.
+#.
+#: ../libvips/iofuncs/buf.c:536
+msgid "TB"
+msgstr ""
+
+#: ../libvips/iofuncs/threadpool.c:197
+msgid "unable to create thread"
+msgstr ""
+
+#: ../libvips/iofuncs/threadpool.c:330
+#, c-format
+msgid "threads clipped to %d"
+msgstr ""
+
+#: ../libvips/iofuncs/threadpool.c:394
+msgid "per-thread state for vipsthreadpool"
+msgstr ""
+
+#: ../libvips/iofuncs/operation.c:276
+msgid "operations"
+msgstr ""
+
+#: ../libvips/iofuncs/operation.c:318
+msgid "usage:"
+msgstr ""
+
+#: ../libvips/iofuncs/operation.c:332 ../libvips/iofuncs/object.c:1243
+#: ../libvips/resample/interpolate.c:612
+#, c-format
+msgid "class \"%s\" not found"
+msgstr ""
+
+#: ../libvips/iofuncs/operation.c:709
+#, c-format
+msgid "unknown argument '%s'"
+msgstr ""
+
+#: ../libvips/iofuncs/operation.c:827
+msgid "too few arguments"
+msgstr ""
+
+#: ../libvips/iofuncs/operation.c:948
+msgid "too many arguments"
+msgstr ""
+
 #: ../libvips/iofuncs/header.c:210
 #, c-format
 msgid "unknown band format %d"
 msgstr ""
 
-#: ../libvips/iofuncs/header.c:611 ../libvips/iofuncs/generate.c:376
+#: ../libvips/iofuncs/header.c:732 ../libvips/iofuncs/generate.c:377
 msgid "too many images"
 msgstr ""
 
-#: ../libvips/iofuncs/header.c:781
+#: ../libvips/iofuncs/header.c:902
 #, c-format
 msgid "field \"%s\" not found"
 msgstr ""
 
-#: ../libvips/iofuncs/header.c:949
+#: ../libvips/iofuncs/header.c:1070
 #, c-format
 msgid "field \"%s\" is of type %s, not %s"
 msgstr ""
 
-#: ../libvips/iofuncs/image.c:291
-msgid "unable to close fd"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:371
-#, c-format
-msgid "%dx%d %s, %d band, %s"
-msgid_plural "%dx%d %s, %d bands, %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libvips/iofuncs/image.c:401
-#, c-format
-msgid " %s, %d band, %s"
-msgid_plural " %s, %d bands, %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libvips/iofuncs/image.c:529
-#, c-format
-msgid "%s %s: %d threads, %d x %d tiles, groups of %d scanlines"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:542
-#, c-format
-msgid "%s %s: %d%% complete"
-msgstr ""
-
-#. Spaces at end help to erase the %complete message we overwrite.
-#.
-#: ../libvips/iofuncs/image.c:559
-#, c-format
-msgid "%s %s: done in %.3gs          \n"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:749
-#, c-format
-msgid "unable to open \"%s\", file too short"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:759
-#, c-format
-msgid "%s is longer than expected"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:776
-#, c-format
-msgid "bad mode \"%s\""
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:849
-msgid "image class"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:947
-msgid "Image filename"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:953
-msgid "Mode"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:954
-msgid "Open mode"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:960
-msgid "Kill"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:961
-msgid "Block evaluation on this image"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:967
-msgid "Demand style"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:968
-msgid "Preferred demand style for this image"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:981
-msgid "Foreign buffer"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:982
-msgid "Pointer to foreign pixels"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:1289
-#, c-format
-msgid "killed for image \"%s\""
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:1902
-msgid "bad image descriptor"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:1960 ../libvips/iofuncs/generate.c:715
-#, c-format
-msgid "unable to output to a %s image"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:2024
-#, c-format
-msgid "auto-rewind for %s failed"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:2080 ../libvips/iofuncs/image.c:2276
-#: ../libvips/iofuncs/image.c:2293
-msgid "no image data"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:2148 ../libvips/iofuncs/image.c:2316
-msgid "image not readable"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:2169 ../libvips/iofuncs/image.c:2346
-#: ../libvips/iofuncs/image.c:2355
-msgid "image already written"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:2193 ../libvips/iofuncs/image.c:2367
-msgid "image not writeable"
-msgstr ""
-
-#: ../libvips/iofuncs/image.c:2240
-msgid "bad file type"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:212
-#, c-format
-msgid "start function failed for image %s"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:531 ../libvips/iofuncs/region.c:601
-#: ../libvips/iofuncs/region.c:748 ../libvips/iofuncs/region.c:1244
-msgid "valid clipped to nothing"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:645
-msgid "bad image type"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:690
-msgid "no pixel data on attached image"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:696
-msgid "images do not match in pixel size"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:729 ../libvips/iofuncs/region.c:1226
-msgid "dest too small"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:816
-msgid "bad position"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:1105 ../libvips/iofuncs/region.c:1297
-#, c-format
-msgid "unable to input from a %s image"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:1129
-msgid "incomplete header"
-msgstr ""
-
-#: ../libvips/iofuncs/region.c:1200
-msgid "inappropriate region type"
-msgstr ""
-
-#: ../libvips/iofuncs/sink.c:105
-#, c-format
-msgid "stop function failed for image \"%s\""
-msgstr ""
-
-#: ../libvips/iofuncs/sink.c:142
-#, c-format
-msgid "start function failed for image \"%s\""
-msgstr ""
-
-#: ../libvips/iofuncs/sink.c:175
-msgid "per-thread state for sink"
-msgstr ""
-
 #: ../libvips/iofuncs/error.c:213
 msgid "windows error"
 msgstr ""
@@ -2718,34 +2705,36 @@ msgid "image must be uncoded"
 msgstr ""
 
 #: ../libvips/iofuncs/error.c:483
-msgid "image coding must be NONE or LABQ"
+msgid "image coding must be 'none' or 'labq'"
 msgstr ""
 
 #: ../libvips/iofuncs/error.c:511
 msgid "unknown image coding"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:537
-msgid "Radiance coding only"
+#: ../libvips/iofuncs/error.c:536
+#, c-format
+msgid "coding '%s' only"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:563
-msgid "LABQ coding only"
-msgstr ""
-
-#: ../libvips/iofuncs/error.c:587
+#: ../libvips/iofuncs/error.c:561
 msgid "image must one band"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:612
+#: ../libvips/iofuncs/error.c:586
 #, c-format
 msgid "image must have %d bands"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:637
+#: ../libvips/iofuncs/error.c:611
 msgid "image must have one or three bands"
 msgstr ""
 
+#: ../libvips/iofuncs/error.c:637
+#, c-format
+msgid "image must have at least %d bands"
+msgstr ""
+
 #: ../libvips/iofuncs/error.c:665
 msgid "images must have the same number of bands, or one must be single-band"
 msgstr ""
@@ -2808,27 +2797,296 @@ msgstr ""
 msgid "images must have the same coding"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:1081
+#: ../libvips/iofuncs/error.c:1079
+#, c-format
+msgid "vector must have %d elements"
+msgstr ""
+
+#: ../libvips/iofuncs/error.c:1104
 #, c-format
 msgid "vector must have 1 or %d elements"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:1106
+#: ../libvips/iofuncs/error.c:1129
 msgid "histograms must have width or height 1"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:1111
+#: ../libvips/iofuncs/error.c:1134
 msgid "histograms must have not have more than 65536 elements"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:1140 ../libvips/iofuncs/error.c:1168
+#: ../libvips/iofuncs/error.c:1165
+msgid "matrix image too large"
+msgstr ""
+
+#: ../libvips/iofuncs/error.c:1170
+msgid "matrix image must have one band"
+msgstr ""
+
+#: ../libvips/iofuncs/error.c:1204 ../libvips/iofuncs/error.c:1232
 msgid "nonsense mask parameters"
 msgstr ""
 
-#: ../libvips/iofuncs/error.c:1193
+#: ../libvips/iofuncs/error.c:1257
 msgid "mask must be 1D"
 msgstr ""
 
+#: ../libvips/iofuncs/sinkdisc.c:121
+msgid "per-thread state for sinkdisc"
+msgstr ""
+
+#: ../libvips/iofuncs/sinkdisc.c:256 ../libvips/iofuncs/util.c:668
+msgid "write failed"
+msgstr ""
+
+#: ../libvips/iofuncs/sink.c:105
+#, c-format
+msgid "stop function failed for image \"%s\""
+msgstr ""
+
+#: ../libvips/iofuncs/sink.c:142
+#, c-format
+msgid "start function failed for image \"%s\""
+msgstr ""
+
+#: ../libvips/iofuncs/sink.c:175
+msgid "per-thread state for sink"
+msgstr ""
+
+#: ../libvips/iofuncs/generate.c:641
+msgid "demand hint not set"
+msgstr ""
+
+#: ../libvips/iofuncs/generate.c:660 ../libvips/iofuncs/generate.c:685
+msgid "generate() called twice"
+msgstr ""
+
+#: ../libvips/iofuncs/generate.c:717 ../libvips/iofuncs/image.c:1966
+#, c-format
+msgid "unable to output to a %s image"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:212
+#, c-format
+msgid "start function failed for image %s"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:531 ../libvips/iofuncs/region.c:601
+#: ../libvips/iofuncs/region.c:748 ../libvips/iofuncs/region.c:1245
+msgid "valid clipped to nothing"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:645
+msgid "bad image type"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:690
+msgid "no pixel data on attached image"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:696
+msgid "images do not match in pixel size"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:729 ../libvips/iofuncs/region.c:1227
+msgid "dest too small"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:816
+msgid "bad position"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:1106 ../libvips/iofuncs/region.c:1298
+#, c-format
+msgid "unable to input from a %s image"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:1130
+msgid "incomplete header"
+msgstr ""
+
+#: ../libvips/iofuncs/region.c:1201
+msgid "inappropriate region type"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:130 ../libvips/iofuncs/mapfile.c:297
+msgid "unable to CreateFileMapping"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:138 ../libvips/iofuncs/mapfile.c:309
+msgid "unable to MapViewOfFile"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:178
+msgid "unable to mmap"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:179
+#, c-format
+msgid ""
+"map failed (%s), running very low on system resources, expect a crash soon"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:196 ../libvips/iofuncs/mapfile.c:303
+msgid "unable to UnmapViewOfFile"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:202
+msgid "unable to munmap file"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:224
+msgid "file is less than 64 bytes"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:229 ../libvips/iofuncs/mapfile.c:263
+msgid "unable to get file status"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:235
+msgid "not a regular file"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:269
+msgid "unable to read data"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:329
+#, c-format
+msgid "unable to mmap: \"%s\" - %s"
+msgstr ""
+
+#: ../libvips/iofuncs/mapfile.c:339
+#, c-format
+msgid "unable to mmap \"%s\" to same address"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:291
+msgid "unable to close fd"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:371
+#, c-format
+msgid "%dx%d %s, %d band, %s"
+msgid_plural "%dx%d %s, %d bands, %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libvips/iofuncs/image.c:401
+#, c-format
+msgid " %s, %d band, %s"
+msgid_plural " %s, %d bands, %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libvips/iofuncs/image.c:535
+#, c-format
+msgid "%s %s: %d threads, %d x %d tiles, groups of %d scanlines"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:548
+#, c-format
+msgid "%s %s: %d%% complete"
+msgstr ""
+
+#. Spaces at end help to erase the %complete message we overwrite.
+#.
+#: ../libvips/iofuncs/image.c:565
+#, c-format
+msgid "%s %s: done in %.3gs          \n"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:755
+#, c-format
+msgid "unable to open \"%s\", file too short"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:765
+#, c-format
+msgid "%s is longer than expected"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:782
+#, c-format
+msgid "bad mode \"%s\""
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:855
+msgid "image class"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:953
+msgid "Image filename"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:959
+msgid "Mode"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:960
+msgid "Open mode"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:966
+msgid "Kill"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:967
+msgid "Block evaluation on this image"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:973
+msgid "Demand style"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:974
+msgid "Preferred demand style for this image"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:987
+msgid "Foreign buffer"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:988
+msgid "Pointer to foreign pixels"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:1295
+#, c-format
+msgid "killed for image \"%s\""
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:1908
+msgid "bad image descriptor"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:2030
+#, c-format
+msgid "auto-rewind for %s failed"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:2086 ../libvips/iofuncs/image.c:2282
+#: ../libvips/iofuncs/image.c:2299
+msgid "no image data"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:2154 ../libvips/iofuncs/image.c:2322
+msgid "image not readable"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:2175 ../libvips/iofuncs/image.c:2352
+#: ../libvips/iofuncs/image.c:2361
+msgid "image already written"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:2199 ../libvips/iofuncs/image.c:2373
+msgid "image not writeable"
+msgstr ""
+
+#: ../libvips/iofuncs/image.c:2246
+msgid "bad file type"
+msgstr ""
+
 #: ../libvips/iofuncs/util.c:651
 msgid "unable to get file stats"
 msgstr ""
@@ -2885,277 +3143,83 @@ msgstr ""
 msgid "unable to make temporary file %s"
 msgstr ""
 
-#. File length unit.
-#.
-#: ../libvips/iofuncs/buf.c:520
-msgid "bytes"
+#: ../libvips/iofuncs/sinkscreen.c:177
+msgid "per-thread state for render"
 msgstr ""
 
-#. Kilo byte unit.
-#.
-#: ../libvips/iofuncs/buf.c:524
-msgid "KB"
-msgstr ""
-
-#. Mega byte unit.
-#.
-#: ../libvips/iofuncs/buf.c:528
-msgid "MB"
-msgstr ""
-
-#. Giga byte unit.
-#.
-#: ../libvips/iofuncs/buf.c:532
-msgid "GB"
-msgstr ""
-
-#. Tera byte unit.
-#.
-#: ../libvips/iofuncs/buf.c:536
-msgid "TB"
-msgstr ""
-
-#: ../libvips/iofuncs/base64.c:170
-msgid "too little data"
-msgstr ""
-
-#. We shouldn't really be used for large amounts of data.
-#.
-#: ../libvips/iofuncs/base64.c:176 ../libvips/iofuncs/base64.c:241
-msgid "too much data"
-msgstr ""
-
-#: ../libvips/iofuncs/generate.c:639
-msgid "demand hint not set"
-msgstr ""
-
-#: ../libvips/iofuncs/generate.c:658 ../libvips/iofuncs/generate.c:683
-msgid "generate() called twice"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:130 ../libvips/iofuncs/mapfile.c:297
-msgid "unable to CreateFileMapping"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:138 ../libvips/iofuncs/mapfile.c:309
-msgid "unable to MapViewOfFile"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:178
-msgid "unable to mmap"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:179
-#, c-format
-msgid ""
-"map failed (%s), running very low on system resources, expect a crash soon"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:196 ../libvips/iofuncs/mapfile.c:303
-msgid "unable to UnmapViewOfFile"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:202
-msgid "unable to munmap file"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:224
-msgid "file is less than 64 bytes"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:229 ../libvips/iofuncs/mapfile.c:263
-msgid "unable to get file status"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:235
-msgid "not a regular file"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:269
-msgid "unable to read data"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:329
-#, c-format
-msgid "unable to mmap: \"%s\" - %s"
-msgstr ""
-
-#: ../libvips/iofuncs/mapfile.c:339
-#, c-format
-msgid "unable to mmap \"%s\" to same address"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:402
-msgid "abort on first error or warning"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:405
-msgid "evaluate with N concurrent threads"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:408
-msgid "set tile width to N (DEBUG)"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:411
-msgid "set tile height to N (DEBUG)"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:414
-msgid "set thinstrip height to N (DEBUG)"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:417
-msgid "set fatstrip height to N (DEBUG)"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:420
-msgid "show progress feedback"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:423
-msgid "leak-check on exit"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:426
-msgid "images larger than N are decompressed to disc"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:429
-msgid "disable vectorised versions of operations"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:432
-msgid "cache at most N operations"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:435
-msgid "cache at most N bytes in memory"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:438
-msgid "allow at most N open files"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:441
-msgid "trace operation cache"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:444
-msgid "dump operation cache on exit"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:447
-msgid "print libvips version"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:470
-msgid "VIPS Options"
-msgstr ""
-
-#: ../libvips/iofuncs/init.c:470
-msgid "Show VIPS options"
-msgstr ""
-
-#: ../libvips/iofuncs/object.c:151
+#: ../libvips/iofuncs/object.c:152
 #, c-format
 msgid "parameter %s not set"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:503
+#: ../libvips/iofuncs/object.c:504
 #, c-format
 msgid "no property named `%s'"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:511
+#: ../libvips/iofuncs/object.c:512
 #, c-format
 msgid "no vips argument named `%s'"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:518
+#: ../libvips/iofuncs/object.c:519
 #, c-format
 msgid "argument `%s' has no instance"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1291
+#: ../libvips/iofuncs/object.c:1292
 msgid "base class"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1305
+#: ../libvips/iofuncs/object.c:1306
 msgid "Nickname"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1306
+#: ../libvips/iofuncs/object.c:1307
 msgid "Class nickname"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1312
+#: ../libvips/iofuncs/object.c:1313
 msgid "Description"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1313
+#: ../libvips/iofuncs/object.c:1314
 msgid "Class description"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1459
+#: ../libvips/iofuncs/object.c:1460
 #, c-format
 msgid "enum '%s' has no member '%s', should be one of: %s"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1564 ../libvips/iofuncs/object.c:1578
-#: ../libvips/iofuncs/object.c:1619
+#: ../libvips/iofuncs/object.c:1565 ../libvips/iofuncs/object.c:1579
+#: ../libvips/iofuncs/object.c:1620
 #, c-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1590
+#: ../libvips/iofuncs/object.c:1591
 #, c-format
 msgid "'%s' is not a double"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1949
+#: ../libvips/iofuncs/object.c:1950
 #, c-format
 msgid "unable to set '%s'"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1957
+#: ../libvips/iofuncs/object.c:1958
 msgid "not , or ) after parameter"
 msgstr ""
 
-#: ../libvips/iofuncs/object.c:1964
+#: ../libvips/iofuncs/object.c:1965
 msgid "extra tokens after ')'"
 msgstr ""
 
-#: ../libvips/iofuncs/threadpool.c:251
-#, c-format
-msgid "threads clipped to %d"
-msgstr ""
-
-#: ../libvips/iofuncs/threadpool.c:315
-msgid "per-thread state for vipsthreadpool"
-msgstr ""
-
-#: ../libvips/iofuncs/memory.c:231
-msgid "vips_free: too many frees"
-msgstr ""
-
-#: ../libvips/iofuncs/memory.c:235
-msgid "vips_free: too much free"
-msgstr ""
-
-#: ../libvips/iofuncs/memory.c:295 ../libvips/iofuncs/memory.c:298
-#, c-format
-msgid "out of memory --- size == %dMB"
-msgstr ""
-
 #: ../libvips/morphology/im_cntlines.c:81
 msgid "flag should be 0 (horizontal) or 1 (vertical)"
 msgstr ""
 
-#: ../libvips/morphology/im_profile.c:104
-msgid "dir not 0 or 1"
-msgstr ""
-
 #: ../libvips/morphology/im_rank_image.c:303
 msgid "zero input images!"
 msgstr ""
@@ -3178,12 +3242,12 @@ msgstr ""
 msgid "image too narrow"
 msgstr ""
 
-#: ../libvips/morphology/im_rank.c:365
-msgid "image too small for window"
+#: ../libvips/morphology/im_profile.c:104
+msgid "dir not 0 or 1"
 msgstr ""
 
-#: ../libvips/mosaicing/im_clinear.c:136
-msgid "im_invmat failed"
+#: ../libvips/morphology/im_rank.c:365
+msgid "image too small for window"
 msgstr ""
 
 #: ../libvips/mosaicing/im_tbmosaic.c:89
@@ -3201,6 +3265,19 @@ msgstr ""
 msgid "unknown Coding type"
 msgstr ""
 
+#: ../libvips/mosaicing/im_avgdxdy.c:64
+msgid "no points to average"
+msgstr ""
+
+#: ../libvips/mosaicing/im_tbcalcon.c:102
+#: ../libvips/mosaicing/im_chkpair.c:204
+msgid "help!"
+msgstr ""
+
+#: ../libvips/mosaicing/im_tbcalcon.c:116
+msgid "overlap too small"
+msgstr ""
+
 #: ../libvips/mosaicing/im_tbmerge.c:163 ../libvips/mosaicing/im_tbmerge.c:217
 #: ../libvips/mosaicing/im_tbmerge.c:535 ../libvips/mosaicing/im_lrmerge.c:213
 #: ../libvips/mosaicing/im_lrmerge.c:262 ../libvips/mosaicing/im_lrmerge.c:603
@@ -3216,6 +3293,40 @@ msgstr ""
 msgid "too much overlap"
 msgstr ""
 
+#: ../libvips/mosaicing/im_lrcalcon.c:203
+msgid "overlap too small for your search size"
+msgstr ""
+
+#: ../libvips/mosaicing/im_lrcalcon.c:242
+#, c-format
+msgid "found %d tie-points, need at least %d"
+msgstr ""
+
+#: ../libvips/mosaicing/im_lrcalcon.c:287
+msgid "not 1-band uchar image"
+msgstr ""
+
+#: ../libvips/mosaicing/im_clinear.c:136
+msgid "im_invmat failed"
+msgstr ""
+
+#: ../libvips/mosaicing/im_remosaic.c:104
+#, c-format
+msgid "substitute image \"%s\" is not the same size as \"%s\""
+msgstr ""
+
+#: ../libvips/mosaicing/im_chkpair.c:200
+msgid "inputs incompatible"
+msgstr ""
+
+#: ../libvips/mosaicing/im_lrmerge.c:703
+msgid "mwidth must be -1 or >= 0"
+msgstr ""
+
+#: ../libvips/mosaicing/im_lrmerge.c:732
+msgid "no overlap"
+msgstr ""
+
 #: ../libvips/mosaicing/global_balance.c:147
 msgid "no matching '>'"
 msgstr ""
@@ -3260,47 +3371,8 @@ msgstr ""
 msgid "empty overlap!"
 msgstr ""
 
-#: ../libvips/mosaicing/im_lrmerge.c:703
-msgid "mwidth must be -1 or >= 0"
-msgstr ""
-
-#: ../libvips/mosaicing/im_lrmerge.c:732
-msgid "no overlap"
-msgstr ""
-
-#: ../libvips/mosaicing/im_avgdxdy.c:64
-msgid "no points to average"
-msgstr ""
-
-#: ../libvips/mosaicing/im_lrcalcon.c:203
-msgid "overlap too small for your search size"
-msgstr ""
-
-#: ../libvips/mosaicing/im_lrcalcon.c:242
-#, c-format
-msgid "found %d tie-points, need at least %d"
-msgstr ""
-
-#: ../libvips/mosaicing/im_lrcalcon.c:287
-msgid "not 1-band uchar image"
-msgstr ""
-
-#: ../libvips/mosaicing/im_chkpair.c:200
-msgid "inputs incompatible"
-msgstr ""
-
-#: ../libvips/mosaicing/im_chkpair.c:204
-#: ../libvips/mosaicing/im_tbcalcon.c:102
-msgid "help!"
-msgstr ""
-
-#: ../libvips/mosaicing/im_remosaic.c:104
-#, c-format
-msgid "substitute image \"%s\" is not the same size as \"%s\""
-msgstr ""
-
-#: ../libvips/mosaicing/im_tbcalcon.c:116
-msgid "overlap too small"
+#: ../libvips/other/im_eye.c:83
+msgid "factor should be in [1,0)"
 msgstr ""
 
 #: ../libvips/other/im_sines.c:88
@@ -3315,46 +3387,6 @@ msgstr ""
 msgid "size must be even and positive"
 msgstr ""
 
-#: ../libvips/other/im_eye.c:83
-msgid "factor should be in [1,0)"
-msgstr ""
-
-#: ../libvips/resample/shrink.c:313
-msgid "shrink factors should be >= 1"
-msgstr ""
-
-#: ../libvips/resample/shrink.c:320
-msgid "not integer shrink factors, expect poor results"
-msgstr ""
-
-#: ../libvips/resample/shrink.c:371
-msgid "shrink an image"
-msgstr ""
-
-#: ../libvips/resample/shrink.c:377
-msgid "Xshrink"
-msgstr ""
-
-#: ../libvips/resample/shrink.c:378
-msgid "Horizontal shrink factor"
-msgstr ""
-
-#: ../libvips/resample/shrink.c:384
-msgid "Yshrink"
-msgstr ""
-
-#: ../libvips/resample/shrink.c:385
-msgid "Vertical shrink factor"
-msgstr ""
-
-#: ../libvips/resample/resample.c:85
-msgid "resample operations"
-msgstr ""
-
-#: ../libvips/resample/im_affine.c:410
-msgid "output coordinates out of range"
-msgstr ""
-
 #: ../libvips/resample/interpolate.c:180
 msgid "VIPS interpolators"
 msgstr ""
@@ -3367,6 +3399,70 @@ msgstr ""
 msgid "Bilinear interpolation"
 msgstr ""
 
+#: ../libvips/resample/resample.c:88
+msgid "resample operations"
+msgstr ""
+
+#: ../libvips/resample/shrink.c:316
+msgid "shrink factors should be >= 1"
+msgstr ""
+
+#: ../libvips/resample/shrink.c:323
+msgid "not integer shrink factors, expect poor results"
+msgstr ""
+
+#: ../libvips/resample/shrink.c:376
+msgid "shrink an image"
+msgstr ""
+
+#: ../libvips/resample/shrink.c:382
+msgid "Xshrink"
+msgstr ""
+
+#: ../libvips/resample/shrink.c:383
+msgid "Horizontal shrink factor"
+msgstr ""
+
+#: ../libvips/resample/shrink.c:389
+msgid "Yshrink"
+msgstr ""
+
+#: ../libvips/resample/shrink.c:390
+msgid "Vertical shrink factor"
+msgstr ""
+
+#: ../libvips/resample/im_affine.c:410
+msgid "output coordinates out of range"
+msgstr ""
+
+#: ../libvips/resample/quadratic.c:235
+msgid "coefficient matrix must have width 2"
+msgstr ""
+
+#: ../libvips/resample/quadratic.c:257
+msgid "coefficient matrix must have height 1, 3, 4 or 6"
+msgstr ""
+
+#: ../libvips/resample/quadratic.c:315
+msgid "resample an image with a quadratic transform"
+msgstr ""
+
+#: ../libvips/resample/quadratic.c:319
+msgid "Coeff"
+msgstr ""
+
+#: ../libvips/resample/quadratic.c:320
+msgid "Coefficient matrix"
+msgstr ""
+
+#: ../libvips/resample/quadratic.c:325
+msgid "Interpolate"
+msgstr ""
+
+#: ../libvips/resample/quadratic.c:326
+msgid "Interpolate values with this"
+msgstr ""
+
 #: ../libvips/video/im_video_test.c:51
 msgid "error requested"
 msgstr ""
@@ -3582,92 +3678,96 @@ msgstr ""
 msgid "no package or function \"%s\""
 msgstr ""
 
-#: ../tools/vips.c:925
+#: ../tools/vips.c:939
 msgid "list classes|packages|all|package-name|operation-name"
 msgstr ""
 
-#: ../tools/vips.c:927
+#: ../tools/vips.c:941
 msgid "generate headers for C++ binding"
 msgstr ""
 
-#: ../tools/vips.c:929
+#: ../tools/vips.c:943
 msgid "generate bodies for C++ binding"
 msgstr ""
 
-#: ../tools/vips.c:931
+#: ../tools/vips.c:945
 msgid "generate links for vips/bin"
 msgstr ""
 
-#: ../tools/vips.c:1051
-msgid "[ACTION] [OPTIONS] [PARAMETERS] - VIPS driver program"
+#: ../tools/vips.c:947
+msgid "list possible actions"
 msgstr ""
 
-#: ../tools/vips.c:1132
+#: ../tools/vips.c:956
 msgid "possible actions:\n"
 msgstr ""
 
-#: ../tools/vips.c:1137
-msgid "execute named vips operation"
+#: ../tools/vips.c:961
+msgid "execute vips operation OP"
 msgstr ""
 
-#: ../tools/vips.c:1139
+#: ../tools/vips.c:1084
+msgid "[ACTION] [OPTIONS] [PARAMETERS] - VIPS driver program"
+msgstr ""
+
+#: ../tools/vips.c:1166
 #, c-format
 msgid "unknown action \"%s\""
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:62
+#: ../tools/vipsthumbnail.c:64
 msgid "set thumbnail size to SIZE"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:63
+#: ../tools/vipsthumbnail.c:65
 msgid "SIZE"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:66
+#: ../tools/vipsthumbnail.c:68
 msgid "set output to FORMAT"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:67
+#: ../tools/vipsthumbnail.c:69
 msgid "FORMAT"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:70
+#: ../tools/vipsthumbnail.c:72
 msgid "resample with INTERPOLATOR"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:71
+#: ../tools/vipsthumbnail.c:73
 msgid "INTERPOLATOR"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:74
+#: ../tools/vipsthumbnail.c:76
 msgid "don't sharpen thumbnail"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:77
+#: ../tools/vipsthumbnail.c:79
 msgid "export with PROFILE"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:78 ../tools/vipsthumbnail.c:82
+#: ../tools/vipsthumbnail.c:80 ../tools/vipsthumbnail.c:84
 msgid "PROFILE"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:81
+#: ../tools/vipsthumbnail.c:83
 msgid "import untagged images with PROFILE"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:85
+#: ../tools/vipsthumbnail.c:87
 msgid "delete profile from exported image"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:88
+#: ../tools/vipsthumbnail.c:90
 msgid "(deprecated, does nothing)"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:91
+#: ../tools/vipsthumbnail.c:93
 msgid "verbose output"
 msgstr ""
 
-#: ../tools/vipsthumbnail.c:432
+#: ../tools/vipsthumbnail.c:444
 msgid "- thumbnail generator"
 msgstr ""
 
@@ -3675,14 +3775,14 @@ msgstr ""
 msgid "B-Splines with antialiasing smoothing"
 msgstr ""
 
-#: ../libvips/resample/nohalo.cpp:1577
-msgid "Edge sharpening resampler with halo reduction"
+#: ../libvips/resample/bicubic.cpp:430
+msgid "Bicubic interpolation (Catmull-Rom)"
 msgstr ""
 
 #: ../libvips/resample/lbb.cpp:861
 msgid "Reduced halo bicubic"
 msgstr ""
 
-#: ../libvips/resample/bicubic.cpp:430
-msgid "Bicubic interpolation (Catmull-Rom)"
+#: ../libvips/resample/nohalo.cpp:1577
+msgid "Edge sharpening resampler with halo reduction"
 msgstr ""