From c8d9ed90251ed4d468f4c71b8cdb13a7ca7d5731 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Wed, 9 Apr 2008 15:37:02 +0000
Subject: [PATCH] stuff

---
 ChangeLog      |    5 +-
 configure.in   |   13 +-
 po/POTFILES.in |  452 ++++++++++-----------
 po/README      |    7 +-
 po/en_GB.po    | 1043 +-----------------------------------------------
 5 files changed, 260 insertions(+), 1260 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 636fbec4..bdbbc720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,10 @@
 - write MAGIC correctly on sparc/powerpc machines (thanks Joe)
 - oop, we were still making fade threads even when not fading
 - tiny cond jump fixes for valgrind in colour.c
-- remove -lstdc++ to avoid being kicked out of Debian
+- remove -lstdc++ from libs, except on windows 
+- push Magick cflags earlier in the include order to make it easier to pick
+  GraphicsMagick over ImageMagick (thanks Mikhail)
+- fix the en_GB translation
 
 25/1/08 started 7.14.0
 - bump all version numbers for new stable
diff --git a/configure.in b/configure.in
index 1d682c4c..68b6fd3e 100644
--- a/configure.in
+++ b/configure.in
@@ -329,15 +329,24 @@ AC_ARG_WITH([cimg], AS_HELP_STRING([--without-cimg], [build without CImg (defaul
 if test x"$with_cimg" != "xno"; then
   AM_CONDITIONAL(WITH_CIMG, true)
   AC_DEFINE(WITH_CIMG,1,[include cimg package])
+
+  # we have to explicitly link with stdc++ on mingw for some reason, yuk!
+  if test x"$vips_os_win32" = "xyes"; then
+    CIMG_LIBS=-lstdc++
+  fi
 else
   AM_CONDITIONAL(WITH_CIMG, false)
   AC_MSG_WARN([disabling CImg binding])
 fi
 
 # Gather all up for VIPS_CFLAGS, VIPS_INCLUDES and VIPS_LIBS
-VIPS_CFLAGS="$VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $PANGOFT2_CFLAGS $FFTW3_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $OPENEXR_CFLAGS $LIBOIL_CFLAGS"
+VIPS_CFLAGS=`for i in $VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $PANGOFT2_CFLAGS $FFTW3_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $OPENEXR_CFLAGS $LIBOIL_CFLAGS
+do
+	echo $i
+done | sort -ru`
+VIPS_CFLAGS=`echo $VIPS_CFLAGS`
 VIPS_INCLUDES="$PNG_INCLUDES $TIFF_INCLUDES $ZIP_INCLUDES $JPEG_INCLUDES $FFTW_INCLUDES $LCMS_INCLUDES" 
-VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $EXIF_LIBS -lm"
+VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $EXIF_LIBS -lm $CIMG_LIBS"
 
 AC_SUBST(VIPS_CFLAGS)
 AC_SUBST(VIPS_INCLUDES)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ad372f35..809593e3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,68 +1,135 @@
-src/mosaicing/find_mosaic.c
-src/mosaicing/mergeup.c
-src/other/spatres.c
-src/other/squares.c
-src/other/simcontr.c
-src/other/glds_features.c
-src/other/glds.c
-src/other/sines.c
-src/other/cooc.c
-src/other/cooc_features.c
-src/iofuncs/binfile.c
-src/iofuncs/vips.c
-src/iofuncs/debugim.c
-src/iofuncs/header.c
-src/iofuncs/edvips.c
-src/iofuncs/printlines.c
+contrib/mitsub/mitsub.c
 contrib/vdump/vdump.c
 contrib/vips2dj/vips2ah.c
 contrib/vips2dj/vips2dj.c
-contrib/mitsub/mitsub.c
-libsrc/histograms_lut/im_invertlut.c
-libsrc/histograms_lut/hist_dispatch.c
-libsrc/histograms_lut/im_project.c
-libsrc/histograms_lut/im_hist.c
-libsrc/histograms_lut/im_histspec.c
-libsrc/histograms_lut/im_stdif.c
-libsrc/histograms_lut/im_maplut.c
-libsrc/histograms_lut/im_histgr.c
-libsrc/histograms_lut/im_identity.c
-libsrc/histograms_lut/im_histnD.c
-libsrc/histograms_lut/tone.c
-libsrc/histograms_lut/im_histplot.c
-libsrc/histograms_lut/im_gammacorrect.c
-libsrc/histograms_lut/im_heq.c
-libsrc/histograms_lut/im_histeq.c
-libsrc/histograms_lut/im_lhisteq.c
-libsrc/histograms_lut/im_buildlut.c
-libsrc/histograms_lut/im_hsp.c
-libsrc/mosaicing/im_tbmerge.c
-libsrc/mosaicing/im_affine.c
-libsrc/mosaicing/im_lrmosaic.c
-libsrc/mosaicing/im_chkpair.c
-libsrc/mosaicing/global_balance.c
-libsrc/mosaicing/im_tbmosaic.c
-libsrc/mosaicing/im_improve.c
-libsrc/mosaicing/im_avgdxdy.c
-libsrc/mosaicing/mosaic1.c
-libsrc/mosaicing/im_remosaic.c
-libsrc/mosaicing/mosaicing_dispatch.c
-libsrc/mosaicing/im_lrcalcon.c
-libsrc/mosaicing/im_lrmerge.c
-libsrc/mosaicing/im_initialize.c
-libsrc/mosaicing/similarity.c
-libsrc/mosaicing/im_tbcalcon.c
-libsrc/mosaicing/match.c
-libsrc/mosaicing/im_clinear.c
-libsrc/matrix/im_mattrn.c
-libsrc/matrix/im_matcat.c
-libsrc/matrix/matalloc.c
-libsrc/matrix/matrix_dispatch.c
-libsrc/matrix/im_matinv.c
-libsrc/matrix/im_matmul.c
+libsrc/acquire/im_clamp.c
+libsrc/arithmetic/im_cmulnorm.c
+libsrc/arithmetic/im_litecor.c
+libsrc/arithmetic/im_logtra.c
+libsrc/arithmetic/im_gadd.c
+libsrc/arithmetic/im_sign.c
+libsrc/arithmetic/im_minpos.c
+libsrc/arithmetic/im_maxpos_avg.c
+libsrc/arithmetic/im_subtract.c
+libsrc/arithmetic/im_max.c
+libsrc/arithmetic/im_remainder.c
+libsrc/arithmetic/im_gfadd.c
+libsrc/arithmetic/im_multiply.c
+libsrc/arithmetic/im_linreg.c
+libsrc/arithmetic/im_gaddim.c
+libsrc/arithmetic/im_abs.c
+libsrc/arithmetic/im_ceil.c
+libsrc/arithmetic/im_cross_phase.c
+libsrc/arithmetic/im_avg.c
+libsrc/arithmetic/im_bandmean.c
+libsrc/arithmetic/im_add.c
+libsrc/arithmetic/im_min.c
+libsrc/arithmetic/im_deviate.c
+libsrc/arithmetic/im_stats.c
+libsrc/arithmetic/im_maxpos_vec.c
+libsrc/arithmetic/im_lintra.c
+libsrc/arithmetic/im_measure.c
+libsrc/arithmetic/im_log10tra.c
+libsrc/arithmetic/im_powtra.c
+libsrc/arithmetic/im_costra.c
+libsrc/arithmetic/im_maxpos.c
+libsrc/arithmetic/im_invert.c
+libsrc/arithmetic/im_rint.c
+libsrc/arithmetic/im_sintra.c
+libsrc/arithmetic/arith_dispatch.c
+libsrc/arithmetic/im_point_bilinear.c
+libsrc/arithmetic/im_expntra.c
+libsrc/arithmetic/im_tantra.c
+libsrc/arithmetic/im_divide.c
+libsrc/arithmetic/im_fav4.c
+libsrc/arithmetic/im_floor.c
+libsrc/boolean/boolean.c
+libsrc/boolean/bool_dispatch.c
+libsrc/cimg/cimg_dispatch.c
+libsrc/colour/im_dE_fromLab.c
+libsrc/colour/im_Lab2LCh.c
+libsrc/colour/im_dECMC_fromLab.c
+libsrc/colour/im_XYZ2Yxy.c
+libsrc/colour/derived.c
+libsrc/colour/im_disp2XYZ.c
+libsrc/colour/im_LabQ2Lab.c
+libsrc/colour/im_Lab2LabQ.c
+libsrc/colour/im_XYZ2disp.c
+libsrc/colour/im_lab_morph.c
+libsrc/colour/im_dE00_fromLab.c
+libsrc/colour/im_Lab2XYZ.c
+libsrc/colour/colour_dispatch.c
+libsrc/colour/colour.c
+libsrc/colour/im_LabQ2disp.c
+libsrc/colour/im_Yxy2XYZ.c
+libsrc/colour/im_XYZ2Lab.c
+libsrc/colour/im_LCh2Lab.c
+libsrc/colour/im_LabS2LabQ.c
+libsrc/colour/im_LabQ2LabS.c
+libsrc/colour/im_UCS2LCh.c
+libsrc/colour/im_Lab2LabS.c
+libsrc/colour/im_icc_transform.c
+libsrc/colour/im_LCh2UCS.c
+libsrc/colour/im_LabS2Lab.c
+libsrc/conversion/im_recomb.c
+libsrc/conversion/im_tbjoin.c
+libsrc/conversion/im_flipver.c
+libsrc/conversion/im_magick2vips.c
+libsrc/conversion/im_c2rect.c
+libsrc/conversion/im_rot90.c
+libsrc/conversion/im_vips2csv.c
+libsrc/conversion/im_c2ps.c
+libsrc/conversion/im_rightshift_size.c
+libsrc/conversion/im_csv2vips.c
+libsrc/conversion/im_insert.c
+libsrc/conversion/im_c2imag.c
+libsrc/conversion/im_falsecolour.c
+libsrc/conversion/im_text.c
+libsrc/conversion/conver_dispatch.c
+libsrc/conversion/im_bandjoin.c
+libsrc/conversion/im_analyze2vips.c
+libsrc/conversion/im_vips2tiff.c
+libsrc/conversion/im_slice.c
+libsrc/conversion/im_wrap.c
+libsrc/conversion/im_rot180.c
+libsrc/conversion/im_scale.c
+libsrc/conversion/im_black.c
+libsrc/conversion/im_ppm2vips.c
+libsrc/conversion/im_c2real.c
+libsrc/conversion/im_scaleps.c
+libsrc/conversion/im_msb.c
+libsrc/conversion/im_ri2c.c
+libsrc/conversion/im_print.c
+libsrc/conversion/im_system.c
+libsrc/conversion/im_c2amph.c
+libsrc/conversion/im_bernd.c
+libsrc/conversion/im_lrjoin.c
+libsrc/conversion/im_tile_cache.c
+libsrc/conversion/im_jpeg2vips.c
+libsrc/conversion/im_copy.c
+libsrc/conversion/im_extract.c
+libsrc/conversion/im_thresh.c
+libsrc/conversion/im_zoom.c
+libsrc/conversion/im_png2vips.c
+libsrc/conversion/im_clip.c
+libsrc/conversion/im_vips2mask.c
+libsrc/conversion/im_vips2ppm.c
+libsrc/conversion/im_replicate.c
+libsrc/conversion/im_rot270.c
+libsrc/conversion/im_grid.c
+libsrc/conversion/im_vips2png.c
+libsrc/conversion/im_fliphor.c
+libsrc/conversion/im_gbandjoin.c
+libsrc/conversion/im_vips2jpeg.c
+libsrc/conversion/im_subsample.c
+libsrc/conversion/im_tiff2vips.c
+libsrc/conversion/im_exr2vips.c
+libsrc/conversion/im_mask2vips.c
+libsrc/conversion/im_raw2vips.c
 libsrc/convolution/im_contrast_surface.c
 libsrc/convolution/im_zerox.c
 libsrc/convolution/im_rank_image.c
+libsrc/convolution/im_phasecor_fft.c
 libsrc/convolution/im_compass.c
 libsrc/convolution/rw_mask.c
 libsrc/convolution/im_resize_linear.c
@@ -86,20 +153,46 @@ libsrc/convolution/im_fastcor.c
 libsrc/convolution/im_conv.c
 libsrc/convolution/im_logmasks.c
 libsrc/convolution/im_addgnoise.c
-libsrc/acquire/im_clamp.c
-libsrc/other/im_simcontr.c
-libsrc/other/im_zone.c
-libsrc/other/im_spatres.c
-libsrc/other/cooc_funcs.c
-libsrc/other/im_benchmark.c
-libsrc/other/other_dispatch.c
-libsrc/other/glds_funcs.c
-libsrc/other/im_meanstd.c
-libsrc/other/im_dif_std.c
-libsrc/other/im_make_xy.c
-libsrc/other/im_eye.c
-libsrc/other/im_sines.c
-libsrc/other/im_grey.c
+libsrc/freq_filt/im_freq_mask.c
+libsrc/freq_filt/im_invfft.c
+libsrc/freq_filt/freq_dispatch.c
+libsrc/freq_filt/im_disp_ps.c
+libsrc/freq_filt/fft_sp.c
+libsrc/freq_filt/fmaskcir.c
+libsrc/freq_filt/im_fwfft.c
+libsrc/freq_filt/im_fractsurf.c
+libsrc/freq_filt/im_freqflt.c
+libsrc/freq_filt/im_invfftr.c
+libsrc/freq_filt/im_rotquad.c
+libsrc/freq_filt/fmask4th.c
+libsrc/histograms_lut/im_invertlut.c
+libsrc/histograms_lut/hist_dispatch.c
+libsrc/histograms_lut/im_project.c
+libsrc/histograms_lut/im_hist.c
+libsrc/histograms_lut/im_histspec.c
+libsrc/histograms_lut/im_stdif.c
+libsrc/histograms_lut/im_maplut.c
+libsrc/histograms_lut/im_histgr.c
+libsrc/histograms_lut/im_identity.c
+libsrc/histograms_lut/im_histnD.c
+libsrc/histograms_lut/tone.c
+libsrc/histograms_lut/im_histplot.c
+libsrc/histograms_lut/im_gammacorrect.c
+libsrc/histograms_lut/im_heq.c
+libsrc/histograms_lut/im_histeq.c
+libsrc/histograms_lut/im_lhisteq.c
+libsrc/histograms_lut/im_buildlut.c
+libsrc/histograms_lut/im_hsp.c
+libsrc/inplace/im_flood.c
+libsrc/inplace/inplace_dispatch.c
+libsrc/inplace/im_paintrect.c
+libsrc/inplace/smudge_area.c
+libsrc/inplace/im_insertplace.c
+libsrc/inplace/im_plotmask.c
+libsrc/inplace/plot_point.c
+libsrc/inplace/im_circle.c
+libsrc/inplace/line_draw.c
+libsrc/inplace/im_line.c
 libsrc/iofuncs/im_setbox.c
 libsrc/iofuncs/rect.c
 libsrc/iofuncs/im_open.c
@@ -148,171 +241,84 @@ libsrc/iofuncs/im_binfile.c
 libsrc/iofuncs/im_debugim.c
 libsrc/iofuncs/im_printlines.c
 libsrc/iofuncs/im_partial.c
+libsrc/iofuncs/im_wbuffer.c
 libsrc/iofuncs/im_setupout.c
 libsrc/iofuncs/im_updatehist.c
 libsrc/iofuncs/im_bits_of_fmt.c
 libsrc/iofuncs/im_initdesc.c
 libsrc/iofuncs/error_exit.c
+libsrc/iofuncs/im_wraptwo.c
 libsrc/iofuncs/dispatch_types.c
 libsrc/iofuncs/region.c
-libsrc/iofuncs/im_wrapone.c
+libsrc/matrix/im_mattrn.c
+libsrc/matrix/im_matcat.c
+libsrc/matrix/matalloc.c
+libsrc/matrix/matrix_dispatch.c
+libsrc/matrix/im_matinv.c
+libsrc/matrix/im_matmul.c
 libsrc/morphology/im_profile.c
 libsrc/morphology/morph_dispatch.c
 libsrc/morphology/im_dilate.c
 libsrc/morphology/im_cntlines.c
 libsrc/morphology/im_erode.c
-libsrc/video/video_dispatch.c
-libsrc/video/im_video_v4l1.c
-libsrc/video/im_video_test.c
-libsrc/dummy.c
+libsrc/mosaicing/im_tbmerge.c
+libsrc/mosaicing/im_affine.c
+libsrc/mosaicing/im_lrmosaic.c
+libsrc/mosaicing/im_chkpair.c
+libsrc/mosaicing/global_balance.c
+libsrc/mosaicing/im_tbmosaic.c
+libsrc/mosaicing/im_improve.c
+libsrc/mosaicing/im_avgdxdy.c
+libsrc/mosaicing/mosaic1.c
+libsrc/mosaicing/im_remosaic.c
+libsrc/mosaicing/mosaicing_dispatch.c
+libsrc/mosaicing/im_maxpos_subpel.c
+libsrc/mosaicing/im_lrcalcon.c
+libsrc/mosaicing/im_lrmerge.c
+libsrc/mosaicing/im_initialize.c
+libsrc/mosaicing/similarity.c
+libsrc/mosaicing/im_tbcalcon.c
+libsrc/mosaicing/im_align_bands.c
+libsrc/mosaicing/match.c
+libsrc/mosaicing/im_clinear.c
+libsrc/other/im_simcontr.c
+libsrc/other/im_zone.c
+libsrc/other/im_spatres.c
+libsrc/other/cooc_funcs.c
+libsrc/other/im_benchmark.c
+libsrc/other/other_dispatch.c
+libsrc/other/glds_funcs.c
+libsrc/other/im_meanstd.c
+libsrc/other/im_dif_std.c
+libsrc/other/im_make_xy.c
+libsrc/other/im_eye.c
+libsrc/other/im_sines.c
+libsrc/other/im_grey.c
 libsrc/relational/im_ifthenelse.c
 libsrc/relational/relational_dispatch.c
 libsrc/relational/relational.c
 libsrc/relational/im_blend.c
-libsrc/arithmetic/im_cmulnorm.c
-libsrc/arithmetic/im_litecor.c
-libsrc/arithmetic/im_logtra.c
-libsrc/arithmetic/im_gadd.c
-libsrc/arithmetic/im_sign.c
-libsrc/arithmetic/im_minpos.c
-libsrc/arithmetic/im_maxpos_avg.c
-libsrc/arithmetic/im_subtract.c
-libsrc/arithmetic/im_max.c
-libsrc/arithmetic/im_remainder.c
-libsrc/arithmetic/im_gfadd.c
-libsrc/arithmetic/im_multiply.c
-libsrc/arithmetic/im_linreg.c
-libsrc/arithmetic/im_gaddim.c
-libsrc/arithmetic/im_abs.c
-libsrc/arithmetic/im_ceil.c
-libsrc/arithmetic/im_avg.c
-libsrc/arithmetic/im_bandmean.c
-libsrc/arithmetic/im_add.c
-libsrc/arithmetic/im_min.c
-libsrc/arithmetic/im_deviate.c
-libsrc/arithmetic/im_stats.c
-libsrc/arithmetic/im_maxpos_vec.c
-libsrc/arithmetic/im_lintra.c
-libsrc/arithmetic/im_measure.c
-libsrc/arithmetic/im_log10tra.c
-libsrc/arithmetic/im_powtra.c
-libsrc/arithmetic/im_costra.c
-libsrc/arithmetic/im_maxpos.c
-libsrc/arithmetic/im_invert.c
-libsrc/arithmetic/im_rint.c
-libsrc/arithmetic/im_sintra.c
-libsrc/arithmetic/arith_dispatch.c
-libsrc/arithmetic/im_point_bilinear.c
-libsrc/arithmetic/im_expntra.c
-libsrc/arithmetic/im_tantra.c
-libsrc/arithmetic/im_divide.c
-libsrc/arithmetic/im_fav4.c
-libsrc/arithmetic/im_floor.c
-libsrc/boolean/boolean.c
-libsrc/boolean/bool_dispatch.c
-libsrc/inplace/im_flood.c
-libsrc/inplace/inplace_dispatch.c
-libsrc/inplace/im_paintrect.c
-libsrc/inplace/smudge_area.c
-libsrc/inplace/im_insertplace.c
-libsrc/inplace/im_plotmask.c
-libsrc/inplace/plot_point.c
-libsrc/inplace/im_circle.c
-libsrc/inplace/line_draw.c
-libsrc/inplace/im_line.c
-libsrc/colour/im_dE_fromLab.c
-libsrc/colour/im_Lab2LCh.c
-libsrc/colour/im_dECMC_fromLab.c
-libsrc/colour/im_XYZ2Yxy.c
-libsrc/colour/derived.c
-libsrc/colour/im_disp2XYZ.c
-libsrc/colour/im_LabQ2Lab.c
-libsrc/colour/im_Lab2LabQ.c
-libsrc/colour/im_XYZ2disp.c
-libsrc/colour/im_lab_morph.c
-libsrc/colour/im_dE00_fromLab.c
-libsrc/colour/im_Lab2XYZ.c
-libsrc/colour/colour_dispatch.c
-libsrc/colour/colour.c
-libsrc/colour/im_LabQ2disp.c
-libsrc/colour/im_Yxy2XYZ.c
-libsrc/colour/im_XYZ2Lab.c
-libsrc/colour/im_LCh2Lab.c
-libsrc/colour/im_LabS2LabQ.c
-libsrc/colour/im_LabQ2LabS.c
-libsrc/colour/im_UCS2LCh.c
-libsrc/colour/im_Lab2LabS.c
-libsrc/colour/im_icc_transform.c
-libsrc/colour/im_LCh2UCS.c
-libsrc/colour/im_LabS2Lab.c
-libsrc/conversion/im_recomb.c
-libsrc/conversion/im_tbjoin.c
-libsrc/conversion/im_flipver.c
-libsrc/conversion/im_magick2vips.c
-libsrc/conversion/im_c2rect.c
-libsrc/conversion/im_rot90.c
-libsrc/conversion/im_vips2csv.c
-libsrc/conversion/im_c2ps.c
-libsrc/conversion/im_rightshift_size.c
-libsrc/conversion/im_csv2vips.c
-libsrc/conversion/im_insert.c
-libsrc/conversion/im_c2imag.c
-libsrc/conversion/im_falsecolour.c
-libsrc/conversion/im_text.c
-libsrc/conversion/conver_dispatch.c
-libsrc/conversion/im_bandjoin.c
-libsrc/conversion/im_analyze2vips.c
-libsrc/conversion/im_vips2tiff.c
-libsrc/conversion/im_slice.c
-libsrc/conversion/im_rot180.c
-libsrc/conversion/im_scale.c
-libsrc/conversion/im_black.c
-libsrc/conversion/im_ppm2vips.c
-libsrc/conversion/im_c2real.c
-libsrc/conversion/im_scaleps.c
-libsrc/conversion/im_msb.c
-libsrc/conversion/im_ri2c.c
-libsrc/conversion/im_print.c
-libsrc/conversion/im_system.c
-libsrc/conversion/im_c2amph.c
-libsrc/conversion/im_bernd.c
-libsrc/conversion/im_lrjoin.c
-libsrc/conversion/im_tile_cache.c
-libsrc/conversion/im_jpeg2vips.c
-libsrc/conversion/im_copy.c
-libsrc/conversion/im_extract.c
-libsrc/conversion/im_thresh.c
-libsrc/conversion/im_zoom.c
-libsrc/conversion/im_png2vips.c
-libsrc/conversion/im_clip.c
-libsrc/conversion/im_vips2mask.c
-libsrc/conversion/im_vips2ppm.c
-libsrc/conversion/im_replicate.c
-libsrc/conversion/im_rot270.c
-libsrc/conversion/im_grid.c
-libsrc/conversion/im_vips2png.c
-libsrc/conversion/im_fliphor.c
-libsrc/conversion/im_gbandjoin.c
-libsrc/conversion/im_vips2jpeg.c
-libsrc/conversion/im_subsample.c
-libsrc/conversion/im_tiff2vips.c
-libsrc/conversion/im_exr2vips.c
-libsrc/conversion/im_mask2vips.c
-libsrc/conversion/im_raw2vips.c
-libsrc/freq_filt/im_freq_mask.c
-libsrc/freq_filt/im_invfft.c
-libsrc/freq_filt/freq_dispatch.c
-libsrc/freq_filt/im_disp_ps.c
-libsrc/freq_filt/fft_sp.c
-libsrc/freq_filt/fmaskcir.c
-libsrc/freq_filt/im_fwfft.c
-libsrc/freq_filt/im_fractsurf.c
-libsrc/freq_filt/im_freqflt.c
-libsrc/freq_filt/im_invfftr.c
-libsrc/freq_filt/im_rotquad.c
-libsrc/freq_filt/fmask4th.c
-libsrcCC/VMask.cc
-libsrcCC/vipsc++.cc
+libsrc/video/video_dispatch.c
+libsrc/video/im_video_v4l1.c
+libsrc/video/im_video_test.c
+src/iofuncs/binfile.c
+src/iofuncs/vips.c
+src/iofuncs/debugim.c
+src/iofuncs/header.c
+src/iofuncs/edvips.c
+src/iofuncs/printlines.c
+src/mosaicing/find_mosaic.c
+src/mosaicing/mergeup.c
+src/other/spatres.c
+src/other/squares.c
+src/other/simcontr.c
+src/other/glds_features.c
+src/other/glds.c
+src/other/sines.c
+src/other/cooc.c
+src/other/cooc_features.c
+libsrcCC/VDisplay.cc
 libsrcCC/VError.cc
 libsrcCC/VImage.cc
-libsrcCC/VDisplay.cc
+libsrcCC/vipsc++.cc
+libsrcCC/VMask.cc
diff --git a/po/README b/po/README
index b60a7b2a..1ebdcb47 100644
--- a/po/README
+++ b/po/README
@@ -20,9 +20,14 @@ and it would display as "Sevy imago os ...", with the "m" underlined.
 tips
 ----
 
+cd vips-7.14.x ; find */* -name "*.c" > po/POTFILES.in
+cd vips-7.14.x ; find */* -name "*.cc" >> po/POTFILES.in
+
+	regenerate the list of files to search for strings
+
 intltool-update --pot
 
-	make a new vips.pot translation template from the sources
+	make a new vips7.pot translation template from the sources
 
 :%s/msgstr ""/msgstr "Malkovich"/
 :%s/msgstr\[0\] ""/msgstr[0] "Malkovich"/
diff --git a/po/en_GB.po b/po/en_GB.po
index 1dbfd777..e8795116 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,1045 +1,22 @@
-# en_GB localisation for nip2
+# UK english translation ... just swap color for colour
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nip2 7.9.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-08 14:51+0100\n"
-"PO-Revision-Date: 2003-11-04 18:57+0000\n"
-"Last-Translator: john.cupitt@ng-london.org.uk\n"
+"Project-Id-Version: vips 7.14.2\n"
+"POT-Creation-Date: 2008-04-09 15:57+0100\n"
+"PO-Revision-Date: 2008-04-09 15:57+0100\n"
+"Last-Translator: john <EMAIL@ADDRESS>\n"
 "Language-Team: en_GB <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsrc/convolution/im_addgnoise.c:78
-msgid "too many bands"
-msgstr ""
-
-#: libsrc/convolution/im_sharpen.c:247
-msgid "input not 3-band short"
-msgstr ""
-
-#: libsrc/convolution/im_sharpen.c:258
-msgid "parameters out of range"
-msgstr ""
-
-#: libsrc/colour/im_icc_transform.c:200 libsrc/colour/im_icc_transform.c:210
-#, c-format
-msgid "unable to open profile \"%s\""
-msgstr ""
-
-#: libsrc/matrix/im_invmat.c:69
-msgid "singular matrix in ludcmp"
-msgstr ""
-
-#: libsrc/matrix/im_invmat.c:206
-msgid "singular matrix"
-msgstr ""
-
-#: libsrc/acquire/im_clamp.c:69
-msgid "bad input format"
-msgstr ""
-
-#: libsrc/acquire/im_clamp.c:74
-msgid "bad black format"
-msgstr ""
-
-#: libsrc/freq_filt/im_invfftr.c:89 libsrc/freq_filt/im_invfftr.c:171
-#: libsrc/freq_filt/im_invfft.c:94 libsrc/freq_filt/im_invfft.c:142
-#: libsrc/freq_filt/im_fwfft.c:112 libsrc/freq_filt/im_fwfft.c:217
-#: libsrc/freq_filt/im_fwfft.c:308 libsrc/freq_filt/im_fwfft.c:420
-msgid "one band uncoded only"
-msgstr ""
-
-#: libsrc/freq_filt/im_invfftr.c:126 libsrc/freq_filt/im_invfftr.c:209
-#: libsrc/freq_filt/im_invfft.c:106 libsrc/freq_filt/im_invfft.c:156
-#: libsrc/freq_filt/im_fwfft.c:123 libsrc/freq_filt/im_fwfft.c:228
-#: libsrc/freq_filt/im_fwfft.c:321 libsrc/freq_filt/im_fwfft.c:433
-msgid "unable to create transform plan"
-msgstr ""
-
-#: libsrc/freq_filt/im_invfftr.c:252 libsrc/freq_filt/im_invfft.c:199
-msgid "one band complex uncoded only"
-msgstr ""
-
-#: libsrc/freq_filt/im_invfftr.c:256 libsrc/freq_filt/im_invfft.c:203
-#: libsrc/freq_filt/im_fwfft.c:515
-msgid "sides must be power of 2"
-msgstr ""
-
-#: libsrc/freq_filt/im_invfftr.c:276 libsrc/freq_filt/im_invfft.c:223
-#: libsrc/freq_filt/im_fwfft.c:535
-msgid "fft_sp failed"
-msgstr ""
-
-#: libsrc/freq_filt/im_fwfft.c:511
-msgid "one band non-complex uncoded only"
-msgstr ""
-
-#: libsrc/conversion/im_extract.c:162
-msgid "bad extract area"
-msgstr ""
-
-#: libsrc/conversion/im_extract.c:167 libsrc/conversion/im_extract.c:252
-msgid "band selection out of range"
-msgstr ""
-
-#: libsrc/conversion/im_extract.c:172
-msgid "unknown image coding type"
-msgstr ""
-
-#: libsrc/conversion/im_extract.c:177
-msgid "can't extract band from IM_CODING_LABQ"
-msgstr ""
-
-#: libsrc/conversion/im_extract.c:256 libsrc/arithmetic/im_powtra.c:184
-#: libsrc/arithmetic/im_deviate.c:171 libsrc/arithmetic/im_multiply.c:186
-#: libsrc/arithmetic/im_ceil.c:92 libsrc/arithmetic/im_maxpos.c:94
-#: libsrc/arithmetic/im_costra.c:117 libsrc/arithmetic/im_costra.c:202
-#: libsrc/arithmetic/im_tantra.c:117 libsrc/arithmetic/im_tantra.c:203
-#: libsrc/arithmetic/im_measure.c:189 libsrc/arithmetic/im_sign.c:146
-#: libsrc/arithmetic/im_expntra.c:184 libsrc/arithmetic/im_logtra.c:123
-#: libsrc/arithmetic/im_abs.c:147 libsrc/arithmetic/im_add.c:254
-#: libsrc/arithmetic/im_avg.c:166 libsrc/arithmetic/im_max.c:232
-#: libsrc/arithmetic/im_min.c:231 libsrc/arithmetic/im_lintra.c:281
-#: libsrc/arithmetic/im_invert.c:117 libsrc/arithmetic/im_stats.c:238
-#: libsrc/arithmetic/im_floor.c:92 libsrc/arithmetic/im_remainder.c:103
-#: libsrc/arithmetic/im_remainder.c:212 libsrc/arithmetic/im_subtract.c:171
-#: libsrc/arithmetic/im_sintra.c:117 libsrc/arithmetic/im_sintra.c:202
-#: libsrc/arithmetic/im_log10tra.c:123 libsrc/arithmetic/im_divide.c:150
-msgid "not uncoded"
-msgstr ""
-
-#: libsrc/conversion/im_magick2vips.c:54 libsrc/conversion/im_magick2vips.c:61
-msgid "libMagick support disabled"
-msgstr ""
-
-#: libsrc/conversion/im_magick2vips.c:190
+#: ../libsrc/conversion/im_magick2vips.c:209
+#: ../libsrc/conversion/im_magick2vips.c:306
 #, c-format
 msgid "unsupported colorspace %d"
-msgstr ""
+msgstr "unsupported colourspace %d"
 
-#: libsrc/conversion/im_magick2vips.c:214
-#, c-format
-msgid "unsupported bit depth %d"
-msgstr ""
-
-#: libsrc/conversion/im_magick2vips.c:409
-msgid "unable to read pixels"
-msgstr ""
-
-#: libsrc/conversion/im_magick2vips.c:431
-#, c-format
-msgid ""
-"unable to read file \"%s\"\n"
-"libMagick error: %s %s"
-msgstr ""
-
-#: libsrc/conversion/im_magick2vips.c:456
-#, c-format
-msgid ""
-"unable to ping file \"%s\"\n"
-"libMagick error: %s %s"
-msgstr ""
-
-#: libsrc/conversion/im_magick2vips.c:467
-msgid "bad image size"
-msgstr ""
-
-#: libsrc/conversion/im_copy.c:138 libsrc/conversion/im_copy.c:275
-msgid "in must be uncoded"
-msgstr ""
-
-#: libsrc/conversion/im_copy.c:142
-msgid "Coding must be NONE or LABQ"
-msgstr ""
-
-#: libsrc/conversion/im_copy.c:146
-#, c-format
-msgid "BandFmt must be in range [0,%d]"
-msgstr ""
-
-#: libsrc/conversion/im_copy.c:169
-msgid "sizeof( pixel ) has changed"
-msgstr ""
-
-#: libsrc/conversion/im_copy.c:312
-msgid "unsupported image type"
-msgstr ""
-
-#: libsrc/conversion/im_ppm2vips.c:250
-msgid "internal error"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:131 libsrc/conversion/im_tiff2vips.c:144
-#: libsrc/conversion/im_vips2tiff.c:127
-msgid "TIFF support disabled"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:284 libsrc/conversion/im_tiff2vips.c:307
-#: libsrc/conversion/im_tiff2vips.c:326
-#, c-format
-msgid "required field %d missing"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:288
-#, c-format
-msgid "required field %d=%d, not %d"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:632
-msgid "read error"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1029
-#, fuzzy
+#: ../libsrc/conversion/im_tiff2vips.c:682
 msgid "bad colormap"
-msgstr "False colour"
-
-#: libsrc/conversion/im_tiff2vips.c:1085 libsrc/conversion/im_tiff2vips.c:1135
-msgid "3 or 4 bands RGB TIFF only"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1284
-msgid "unknown resolution unit"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1360
-#, c-format
-msgid "unsupported sample format %d for lab image"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1370
-#, c-format
-msgid "unsupported depth %d for LAB image"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1417
-#, c-format
-msgid "unsupported sample format %d for greyscale image"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1426
-#, c-format
-msgid "unsupported depth %d for greyscale image"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1466
-#, c-format
-msgid "unsupported sample format %d for rgb image"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1475
-#, c-format
-msgid "unsupported depth %d for RGB image"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1489
-#, c-format
-msgid "unknown photometric interpretation %d"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1550
-#, c-format
-msgid "bad page number %d"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1577 libsrc/conversion/im_vips2tiff.c:265
-#, c-format
-msgid "unable to open \"%s\" for input"
-msgstr ""
-
-#: libsrc/conversion/im_tiff2vips.c:1627 libsrc/conversion/im_tiff2vips.c:1661
-#, c-format
-msgid "TIFF file does not contain page %d"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:228
-#, c-format
-msgid "TIFF error in \"%s\": "
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:245
-#, c-format
-msgid "unable to open \"%s\" for output"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:381
-#, c-format
-msgid "file \"%s\" too long"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:393
-#, c-format
-msgid "error reading from file \"%s\""
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:416
-#, c-format
-msgid "unable to read profile \"%s\""
-msgstr ""
-
-#. Out of space!
-#.
-#: libsrc/conversion/im_vips2tiff.c:688
-msgid "layer buffer exhausted -- try making TIFF output tiles smaller"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:919
-msgid "TIFF write tile failed"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:994
-msgid "internal error #9876345"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1109
-msgid "TIFF write failed"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1238
-msgid "bad JPEG quality parameter"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1244
-#, c-format
-msgid ""
-"unknown compression mode \"%s\"\n"
-"should be one of \"none\", \"packbits\", \"ccittfax4\", \"lzw\", \"deflate\" "
-"or \"jpeg\""
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1258
-msgid "bad tile sizes"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1265
-#, c-format
-msgid "bad tile size %dx%d"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1273
-msgid "tile size not a multiple of 16"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1282
-#, c-format
-msgid ""
-"unknown layout mode \"%s\"\n"
-"should be one of \"tile\" or \"strip\""
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1294
-#, c-format
-msgid ""
-"unknown multi-res mode \"%s\"\n"
-"should be one of \"flat\" or \"pyramid\""
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1306
-#, c-format
-msgid ""
-"unknown format \"%s\"\n"
-"should be one of \"onebit\" or \"manybit\""
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1318
-#, c-format
-msgid ""
-"unknown resolution unit \"%s\"\n"
-"should be one of \"res_cm\" or \"res_inch\""
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1327
-msgid "bad resolution values"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1342
-#, c-format
-msgid "unknown extra options \"%s\""
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1346
-msgid "can't have strip pyramid -- enabling tiling"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1356
-msgid "can only pyramid LABQ and non-complex images"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1372
-msgid "can't have 1-bit JPEG -- disabling JPEG"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1529
-msgid "unknown coding type"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1537
-msgid "unsigned 8-bit int, 16-bit int, and 32-bit float only"
-msgstr ""
-
-#: libsrc/conversion/im_vips2tiff.c:1543
-msgid "1 to 4 bands only"
-msgstr ""
-
-#: libsrc/arithmetic/im_powtra.c:188 libsrc/arithmetic/im_tantra.c:121
-#: libsrc/arithmetic/im_tantra.c:207 libsrc/arithmetic/im_expntra.c:188
-#: libsrc/arithmetic/im_logtra.c:127 libsrc/arithmetic/im_sintra.c:121
-#: libsrc/arithmetic/im_sintra.c:206 libsrc/arithmetic/im_log10tra.c:127
-msgid "not non-complex"
-msgstr ""
-
-#: libsrc/arithmetic/im_powtra.c:193 libsrc/arithmetic/im_expntra.c:193
-#: libsrc/arithmetic/im_lintra.c:290 libsrc/arithmetic/im_remainder.c:217
-#, c-format
-msgid "not 1 or %d elements in vector"
-msgstr ""
-
-#: libsrc/arithmetic/im_deviate.c:175 libsrc/arithmetic/im_costra.c:121
-#: libsrc/arithmetic/im_costra.c:206 libsrc/arithmetic/im_measure.c:193
-#: libsrc/arithmetic/im_avg.c:162 libsrc/arithmetic/im_stats.c:234
-msgid "bad input type"
-msgstr ""
-
-#: libsrc/arithmetic/im_multiply.c:177 libsrc/arithmetic/im_remainder.c:94
-msgid "not same size"
-msgstr ""
-
-#: libsrc/arithmetic/im_multiply.c:182 libsrc/arithmetic/im_add.c:250
-#: libsrc/arithmetic/im_remainder.c:99 libsrc/arithmetic/im_subtract.c:167
-#: libsrc/arithmetic/im_divide.c:146
-msgid "not same number of bands"
-msgstr ""
-
-#: libsrc/arithmetic/im_minpos.c:80
-msgid "input must be uncoded"
-msgstr ""
-
-#: libsrc/arithmetic/im_gadd.c:91 libsrc/arithmetic/im_gadd.c:107
-msgid "Unable to accept image1"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:79
-msgid "absolute value"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:98
-msgid "add two images"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:123
-msgid "average value of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:142
-msgid "multiply two complex images, normalising output"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:167
-msgid "standard deviation of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:186
-msgid "10^pel of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:205
-msgid "e^pel of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:234
-msgid "x^pel of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:263
-msgid "[x,y,z]^pel of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:299
-msgid "average of 4 images"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:318
-msgid "divide two images"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:352
-msgid "calculate a*in1 + b*in2 + c = outfile"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:371
-msgid "photographic negative"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:402
-msgid "calculate a*in + b = outfile"
-msgstr ""
-
-#: libsrc/arithmetic/arith_dispatch.c:427
-msgid "vectors not same length"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:438
-msgid "calculate a*in + b -> out, a and b vectors"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:470
-msgid "calculate max(white)*factor*(in/white), if clip == 1"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:489
-msgid "log10 of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:508
-msgid "ln of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:527
-msgid "tan of image (angles in degrees)"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:546
-msgid "atan of image (result in degrees)"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:565
-msgid "cos of image (angles in degrees)"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:584
-msgid "acos of image (result in degrees)"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:603
-msgid "round to smallest integal value not less than"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:622
-msgid "round to largest integal value not greater than"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:641
-msgid "round to nearest integal value"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:660
-msgid "sin of image (angles in degrees)"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:679
-msgid "unit vector in direction of value"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:698
-msgid "asin of image (result in degrees)"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:723
-msgid "maximum value of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:758
-msgid "position of maximum value of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:818
-msgid "measure averages of a grid of patches"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:843
-msgid "minimum value of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:871
-msgid "position of minimum value of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:890
-msgid "remainder after integer division"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:919
-msgid "remainder after integer division by a constant"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:948
-msgid "remainder after integer division by a vector of constants"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:968
-msgid "multiply two images"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:989
-msgid "pel^x ofbuildimage"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:1010
-msgid "pel^[x,y,z] of image"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:1041
-msgid "many image statistics in one pass"
-msgstr ""
-
-#. Name
-#: libsrc/arithmetic/arith_dispatch.c:1060
-msgid "subtract two images"
-msgstr ""
-
-#: libsrc/arithmetic/im_measure.c:106
-#, c-format
-msgid "patch %d is out of range"
-msgstr ""
-
-#: libsrc/arithmetic/im_measure.c:148
-#, c-format
-msgid "patch %d, band %d: avg = %g, sdev = %g"
-msgstr ""
-
-#: libsrc/arithmetic/im_abs.c:183
-msgid "unknown input type"
-msgstr ""
-
-#: libsrc/arithmetic/im_add.c:190
-#, c-format
-msgid "not one band or %d bands"
-msgstr ""
-
-#: libsrc/arithmetic/im_add.c:194
-msgid "bad bands"
-msgstr ""
-
-#: libsrc/arithmetic/im_invert.c:121
-msgid "not UCHAR"
-msgstr ""
-
-#: libsrc/arithmetic/im_remainder.c:239
-msgid "division by zero"
-msgstr ""
-
-#: libsrc/relational/im_blend.c:338
-msgid "images not uncoded"
-msgstr ""
-
-#: libsrc/relational/im_blend.c:344 libsrc/relational/im_ifthenelse.c:183
-msgid "size and format of then and else must match"
-msgstr ""
-
-#: libsrc/relational/im_blend.c:349 libsrc/relational/im_ifthenelse.c:188
-msgid "conditional image must be uchar"
-msgstr ""
-
-#: libsrc/relational/im_blend.c:354 libsrc/relational/im_ifthenelse.c:193
-msgid "conditional image must be one band or same as then and else images"
-msgstr ""
-
-#: libsrc/relational/im_ifthenelse.c:167
-msgid "then image must be uncoded or labpack"
-msgstr ""
-
-#: libsrc/relational/im_ifthenelse.c:172
-msgid "else image must be uncoded or labpack"
-msgstr ""
-
-#: libsrc/relational/im_ifthenelse.c:177
-msgid "condition image must be uncoded"
-msgstr ""
-
-#: libsrc/histograms_lut/im_maplut.c:112
-#, c-format
-msgid "%d overflows detected"
-msgstr ""
-
-#. Switch for input types. Has to be uint type!
-#.
-#: libsrc/histograms_lut/im_maplut.c:473
-msgid "bad input file"
-msgstr ""
-
-#. Switch for LUT types. One function for non-complex images, a
-#. * variant for complex ones. Another pair as well, in case the input is not
-#. * uchar.
-#.
-#: libsrc/histograms_lut/im_maplut.c:504
-msgid "bad lut file"
-msgstr ""
-
-#: libsrc/histograms_lut/im_maplut.c:554
-msgid "lut is not uncoded"
-msgstr ""
-
-#: libsrc/histograms_lut/im_maplut.c:558
-msgid "lut seems very large!"
-msgstr ""
-
-#: libsrc/histograms_lut/im_maplut.c:570
-msgid "input is not uncoded"
-msgstr ""
-
-#: libsrc/histograms_lut/im_maplut.c:574
-msgid "input is not some unsigned integer type"
-msgstr ""
-
-#: libsrc/histograms_lut/im_maplut.c:579
-msgid ""
-"lut should have 1 band, or same number of bands as input, or any number of "
-"bands if input has 1 band"
-msgstr ""
-
-#: libsrc/histograms_lut/im_maplut.c:586
-msgid "input is uchar and lut does not have 256 elements"
-msgstr ""
-
-#: libsrc/histograms_lut/im_histnD.c:212
-msgid " uncoded images only"
-msgstr ""
-
-#: libsrc/histograms_lut/im_histnD.c:218
-msgid " unsigned 8 or 16 bit images only"
-msgstr ""
-
-#: libsrc/histograms_lut/im_histnD.c:225
-#, c-format
-msgid " bins out of range [1,%d]"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:233
-msgid "bad in_max, out_max parameters"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:237
-msgid "bad Lb, Lw parameters"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:241
-msgid "Ps not in range [0.0,1.0]"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:245
-msgid "Pm not in range [0.0,1.0]"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:249
-msgid "Ph not in range [0.0,1.0]"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:253
-msgid "S not in range [-30,+30]"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:257
-msgid "M not in range [-30,+30]"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:261
-msgid "H not in range [-30,+30]"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:342 libsrc/histograms_lut/tone.c:390
-msgid "not 1 by n or n by 1 image"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:396
-msgid "not 1024-point IM_BANDFMT_SHORT lut"
-msgstr ""
-
-#: libsrc/histograms_lut/tone.c:413 libsrc/histograms_lut/tone.c:487
-msgid "input not LabS or LabQ"
-msgstr ""
-
-#: libsrc/inplace/im_insertplace.c:81
-msgid "inputs differ in format"
-msgstr ""
-
-#: libsrc/inplace/im_insertplace.c:85
-msgid "input should be uncoded or IM_CODING_LABQ"
-msgstr ""
-
-#: libsrc/inplace/im_insertplace.c:104
-msgid "small not inside big"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:134 libsrc/iofuncs/im_mapfile.c:301
-msgid "unable to CreateFileMapping"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:150 libsrc/iofuncs/im_mapfile.c:313
-msgid "unable to MapViewOfFile"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:177
-msgid "unable to mmap"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:178
-#, c-format
-msgid ""
-"map failed (%s), running very low on system resources, expect a crash soon"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:195 libsrc/iofuncs/im_mapfile.c:307
-msgid "unable to UnmapViewOfFile"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:201
-msgid "unable to munmap file"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:224 libsrc/iofuncs/im_mapfile.c:265
-msgid "unable to get file status"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:229
-msgid "file is less than 64 bytes"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:233
-msgid "not a regular file"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:270
-msgid "unable to read data"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:333
-#, c-format
-msgid "unable to mmap: \"%s\" - %s"
-msgstr ""
-
-#: libsrc/iofuncs/im_mapfile.c:343
-#, c-format
-msgid "unable to mmap \"%s\" to same address"
-msgstr ""
-
-#: libsrc/iofuncs/im_binfile.c:88 libsrc/iofuncs/im_render.c:1079
-msgid "bad parameters"
-msgstr ""
-
-#: libsrc/iofuncs/im_binfile.c:116
-#, c-format
-msgid "unable to open %s: file has been truncated"
-msgstr ""
-
-#: libsrc/iofuncs/im_binfile.c:126
-#, c-format
-msgid "%s is longer than expected"
-msgstr ""
-
-#: libsrc/iofuncs/error.c:114
-msgid "windows error"
-msgstr ""
-
-#: libsrc/iofuncs/error.c:123
-msgid "unix error"
-msgstr ""
-
-#: libsrc/iofuncs/error.c:149 libsrc/iofuncs/error.c:150
-#: libsrc/iofuncs/error.c:170 libsrc/iofuncs/error.c:171
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: libsrc/iofuncs/error.c:149
-msgid "vips diagnostic"
-msgstr ""
-
-#: libsrc/iofuncs/error.c:170
-msgid "vips warning"
-msgstr ""
-
-#: libsrc/iofuncs/im_readhist.c:163
-msgid "history file too large"
-msgstr ""
-
-#: libsrc/iofuncs/im_readhist.c:174
-msgid "unable to read"
-msgstr ""
-
-#: libsrc/iofuncs/im_header.c:102
-#, c-format
-msgid "no such int field \"%s\""
-msgstr ""
-
-#: libsrc/iofuncs/im_header.c:124
-#, c-format
-msgid "no such double field \"%s\""
-msgstr ""
-
-#: libsrc/iofuncs/im_header.c:146
-#, c-format
-msgid "no such string field \"%s\""
-msgstr ""
-
-#: libsrc/iofuncs/im_printdesc.c:112
-msgid "<bad Type>"
-msgstr ""
-
-#: libsrc/iofuncs/im_printdesc.c:118
-msgid "<bad BandFmt>"
-msgstr ""
-
-#: libsrc/iofuncs/im_printdesc.c:124
-msgid "<bad Coding>"
-msgstr ""
-
-#: libsrc/iofuncs/im_printdesc.c:130
-msgid "<bad Compression>"
-msgstr ""
-
-#: libsrc/iofuncs/im_printdesc.c:136
-msgid "<bad dtype>"
-msgstr ""
-
-#: libsrc/iofuncs/im_printdesc.c:142
-msgid "<bad dhint>"
-msgstr ""
-
-#: libsrc/iofuncs/im_render.c:511 libsrc/iofuncs/im_render.c:666
-#: libsrc/iofuncs/threadgroup.c:330
-msgid "unable to create thread"
-msgstr ""
-
-#: libsrc/iofuncs/package.c:436
-#, c-format
-msgid "unable to close plugin \"%s\""
-msgstr ""
-
-#: libsrc/iofuncs/package.c:438 libsrc/iofuncs/package.c:488
-#: libsrc/iofuncs/package.c:502
-#, c-format
-msgid "plugin error: %s"
-msgstr ""
-
-#: libsrc/iofuncs/package.c:462
-msgid "plugins not supported on this platform"
-msgstr ""
-
-#: libsrc/iofuncs/package.c:486
-#, c-format
-msgid "unable to open plugin \"%s\""
-msgstr ""
-
-#: libsrc/iofuncs/package.c:499
-#, c-format
-msgid "unable to find symbol \"package_table\" in plugin \"%s\""
-msgstr ""
-
-#: libsrc/iofuncs/package.c:513
-#, c-format
-msgid "corrupted package table in plugin \"%s\""
-msgstr ""
-
-#: libsrc/iofuncs/package.c:636 libsrc/iofuncs/package.c:692
-#, c-format
-msgid "function \"%s\" not found"
-msgstr ""
-
-#: libsrc/iofuncs/package.c:664
-#, c-format
-msgid "package \"%s\" not found"
-msgstr ""
-
-#: libsrc/iofuncs/package.c:802
-msgid "too few arguments"
-msgstr ""
-
-#: libsrc/iofuncs/package.c:824
-msgid "too many arguments"
-msgstr ""
-
-#: libsrc/iofuncs/package.c:1031
-msgid "flag not 0,1,2"
-msgstr ""
-
-#: libsrc/iofuncs/im_wrapmany.c:158
-msgid "too many input images"
-msgstr ""
-
-#: libsrc/iofuncs/im_wrapmany.c:176
-msgid "descriptors differ in size"
-msgstr ""
-
-#~ msgid "Edit color \"%s\""
-#~ msgstr "Edit colour \"%s\""
-
-#~ msgid "Set color"
-#~ msgstr "Set colour"
-
-#~ msgid "Double-click to edit this color, or drag-and-drop between colors"
-#~ msgstr "Double-click to edit this colour, or drag-and-drop between colours"
-
-#, fuzzy
-#~ msgid "Header for \"%s\""
-#~ msgstr "Edit colour \"%s\""
-
-#, fuzzy
-#~ msgid "Edit \"%s\""
-#~ msgstr "Edit colour \"%s\""
-
-#, fuzzy
-#~ msgid "Edit matrix \"%s\""
-#~ msgstr "Edit colour \"%s\""
-
-#, fuzzy
-#~ msgid "Set option"
-#~ msgstr "Set colour"
-
-#, fuzzy
-#~ msgid "Edit column item \"%s\""
-#~ msgstr "Edit colour \"%s\""
-
-#, fuzzy
-#~ msgid "Edit slider \"%s\""
-#~ msgstr "Edit colour \"%s\""
-
-#, fuzzy
-#~ msgid "Set Slider"
-#~ msgstr "Set colour"
-
-#, fuzzy
-#~ msgid "Set toggle"
-#~ msgstr "Set colour"
+msgstr "bad colourmap"