From 5b43d4dd44b66d3b115bac84655f73ea908b8642 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 13 Jul 2012 14:55:26 +0100 Subject: [PATCH] get ready for dist --- libvips/conversion/insert.c | 1 - po/POTFILES.in | 38 +- po/vips7.pot | 703 ++++++++++++++++++++---------------- 3 files changed, 391 insertions(+), 351 deletions(-) diff --git a/libvips/conversion/insert.c b/libvips/conversion/insert.c index 2f22d58b..14a13da6 100644 --- a/libvips/conversion/insert.c +++ b/libvips/conversion/insert.c @@ -339,7 +339,6 @@ vips_insert_class_init( VipsInsertClass *class ) { GObjectClass *gobject_class = G_OBJECT_CLASS( class ); VipsObjectClass *vobject_class = VIPS_OBJECT_CLASS( class ); - VipsOperationClass *operation_class = VIPS_OPERATION_CLASS( class ); VIPS_DEBUG_MSG( "vips_insert_class_init\n" ); diff --git a/po/POTFILES.in b/po/POTFILES.in index 5ac44641..d3dde11a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -105,7 +105,6 @@ libvips/convolution/convol_dispatch.c libvips/convolution/im_aconv.c libvips/convolution/im_addgnoise.c libvips/convolution/im_sharpen.c -libvips/dummy.c libvips/foreign/rawsave.c libvips/foreign/radload.c libvips/foreign/tiffload.c @@ -118,6 +117,7 @@ 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 @@ -246,10 +246,10 @@ libvips/other/im_make_xy.c libvips/other/im_zone.c libvips/other/im_eye.c libvips/other/im_grey.c -libvips/resample/im_shrink.c libvips/resample/resample_dispatch.c +libvips/resample/shrink.c +libvips/resample/resample.c libvips/resample/im_affine.c -libvips/resample/im_rightshift_size.c libvips/resample/transform.c libvips/resample/interpolate.c libvips/video/video_dispatch.c @@ -264,36 +264,12 @@ tools/vipsthumbnail.c libvipsCC/VDisplay.cc libvipsCC/VError.cc libvipsCC/VImage.cc -libvipsCC/vipsc++.cc libvipsCC/VMask.cc -libvips/cimg/dummy2.cc -libvips/arithmetic/binary.h -libvips/arithmetic/unaryconst.h -libvips/arithmetic/statistic.h -libvips/arithmetic/arithmetic.h -libvips/arithmetic/unary.h libvipsCC/include/vips/VImage.h libvipsCC/include/vips/vipscpp.h libvipsCC/include/vips/VDisplay.h libvipsCC/include/vips/VError.h -libvipsCC/include/vips/vipsc++.h libvipsCC/include/vips/VMask.h -libvips/cimg/CImg.h -libvips/conversion/conversion.h -libvips/conversion/bandary.h -libvips/foreign/dbh.h -libvips/foreign/matlab.h -libvips/foreign/jpeg.h -libvips/foreign/analyze2vips.h -libvips/foreign/vipspng.h -libvips/foreign/ppm.h -libvips/foreign/csv.h -libvips/foreign/openexr2vips.h -libvips/foreign/openslide2vips.h -libvips/foreign/radiance.h -libvips/foreign/magick.h -libvips/foreign/tiff.h -libvips/foreign/fits.h libvips/include/vips/mosaicing.h libvips/include/vips/semaphore.h libvips/include/vips/freq_filt.h @@ -343,14 +319,6 @@ libvips/include/vips/resample.h libvips/include/vips/internal.h libvips/include/vips/disp.h libvips/include/vips/type.h -libvips/inplace/draw.h -libvips/iofuncs/sink.h -libvips/iofuncs/base64.h -libvips/mosaicing/global_balance.h -libvips/mosaicing/mosaic.h -libvips/mosaicing/merge.h -libvips/resample/templates.h -libvips/video/im_video_v4l1.h libvips/cimg/cimg.cpp libvips/resample/vsqbs.cpp libvips/resample/nohalo.cpp diff --git a/po/vips7.pot b/po/vips7.pot index f1b80d90..49b98776 100644 --- a/po/vips7.pot +++ b/po/vips7.pot @@ -9,7 +9,7 @@ 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" -"POT-Creation-Date: 2012-05-29 13:36+0100\n" +"POT-Creation-Date: 2012-07-13 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,9 +46,9 @@ 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:382 ../libvips/arithmetic/min.c:325 +#: ../libvips/arithmetic/arithmetic.c:385 ../libvips/arithmetic/min.c:325 #: ../libvips/arithmetic/max.c:324 ../libvips/conversion/conversion.c:89 -#: ../libvips/foreign/foreign.c:903 +#: ../libvips/foreign/foreign.c:926 ../libvips/resample/resample.c:95 msgid "Output" msgstr "" @@ -314,41 +314,41 @@ msgid "Number of patches down chart" msgstr "" #: ../libvips/arithmetic/measure.c:222 ../libvips/arithmetic/binary.c:95 -#: ../libvips/conversion/extract.c:200 +#: ../libvips/conversion/extract.c:203 msgid "Left" msgstr "" -#: ../libvips/arithmetic/measure.c:223 ../libvips/conversion/extract.c:201 +#: ../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:207 +#: ../libvips/arithmetic/measure.c:229 ../libvips/conversion/extract.c:210 msgid "Top" msgstr "" -#: ../libvips/arithmetic/measure.c:230 ../libvips/conversion/extract.c:208 +#: ../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:214 -#: ../libvips/conversion/black.c:128 ../libvips/conversion/copy.c:331 -#: ../libvips/conversion/embed.c:536 ../libvips/foreign/rawload.c:122 -#: ../libvips/iofuncs/image.c:858 +#: ../libvips/arithmetic/measure.c:236 ../libvips/conversion/extract.c:217 +#: ../libvips/conversion/black.c:128 ../libvips/conversion/copy.c:334 +#: ../libvips/conversion/embed.c:544 ../libvips/foreign/rawload.c:122 +#: ../libvips/iofuncs/image.c:875 msgid "Width" msgstr "" -#: ../libvips/arithmetic/measure.c:237 ../libvips/conversion/extract.c:215 +#: ../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:221 -#: ../libvips/conversion/black.c:135 ../libvips/conversion/copy.c:338 -#: ../libvips/conversion/embed.c:543 ../libvips/foreign/rawload.c:129 -#: ../libvips/iofuncs/image.c:865 +#: ../libvips/arithmetic/measure.c:243 ../libvips/conversion/extract.c:224 +#: ../libvips/conversion/black.c:135 ../libvips/conversion/copy.c:341 +#: ../libvips/conversion/embed.c:551 ../libvips/foreign/rawload.c:129 +#: ../libvips/iofuncs/image.c:882 msgid "Height" msgstr "" -#: ../libvips/arithmetic/measure.c:244 ../libvips/conversion/extract.c:222 +#: ../libvips/arithmetic/measure.c:244 ../libvips/conversion/extract.c:225 msgid "Height of extract area" msgstr "" @@ -391,18 +391,19 @@ 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:476 ../libvips/conversion/flatten.c:372 -#: ../libvips/conversion/extract.c:194 ../libvips/conversion/extract.c:353 -#: ../libvips/conversion/bandjoin.c:171 ../libvips/conversion/copy.c:318 +#: ../libvips/conversion/cast.c:479 ../libvips/conversion/flatten.c:375 +#: ../libvips/conversion/extract.c:197 ../libvips/conversion/extract.c:356 +#: ../libvips/conversion/bandjoin.c:171 ../libvips/conversion/copy.c:321 #: ../libvips/conversion/rot.c:355 ../libvips/conversion/replicate.c:196 -#: ../libvips/conversion/tilecache.c:422 ../libvips/conversion/embed.c:516 -#: ../libvips/conversion/cache.c:106 ../libvips/conversion/recomb.c:200 -#: ../libvips/conversion/sequential.c:153 ../libvips/foreign/foreign.c:1410 +#: ../libvips/conversion/tilecache.c:446 ../libvips/conversion/embed.c:524 +#: ../libvips/conversion/cache.c:106 ../libvips/conversion/recomb.c:203 +#: ../libvips/conversion/sequential.c:153 ../libvips/foreign/foreign.c:1438 +#: ../libvips/resample/resample.c:89 msgid "Input" msgstr "" #: ../libvips/arithmetic/unary.c:88 ../libvips/conversion/bandmean.c:198 -#: ../libvips/conversion/recomb.c:201 +#: ../libvips/conversion/recomb.c:204 ../libvips/resample/resample.c:90 msgid "Input image argument" msgstr "" @@ -433,12 +434,13 @@ msgstr "" msgid "too many input images" msgstr "" -#: ../libvips/arithmetic/arithmetic.c:378 +#: ../libvips/arithmetic/arithmetic.c:379 msgid "arithmetic operations" msgstr "" -#: ../libvips/arithmetic/arithmetic.c:383 -#: ../libvips/conversion/conversion.c:90 ../libvips/foreign/foreign.c:904 +#: ../libvips/arithmetic/arithmetic.c:386 +#: ../libvips/conversion/conversion.c:90 ../libvips/foreign/foreign.c:927 +#: ../libvips/resample/resample.c:96 msgid "Output image" msgstr "" @@ -447,7 +449,7 @@ msgid "find image minimum" msgstr "" #: ../libvips/arithmetic/min.c:332 ../libvips/arithmetic/max.c:331 -#: ../libvips/conversion/embed.c:522 +#: ../libvips/conversion/embed.c:530 msgid "x" msgstr "" @@ -456,7 +458,7 @@ msgid "Horizontal position of minimum" msgstr "" #: ../libvips/arithmetic/min.c:339 ../libvips/arithmetic/max.c:338 -#: ../libvips/conversion/embed.c:529 +#: ../libvips/conversion/embed.c:537 msgid "y" msgstr "" @@ -562,11 +564,11 @@ msgid "VIPS statistic operations" msgstr "" #: ../libvips/arithmetic/statistic.c:152 ../libvips/conversion/flip.c:241 -#: ../libvips/conversion/cast.c:477 ../libvips/conversion/flatten.c:373 -#: ../libvips/conversion/extract.c:195 ../libvips/conversion/extract.c:354 -#: ../libvips/conversion/copy.c:319 ../libvips/conversion/rot.c:356 -#: ../libvips/conversion/replicate.c:197 ../libvips/conversion/tilecache.c:423 -#: ../libvips/conversion/embed.c:517 ../libvips/conversion/cache.c:107 +#: ../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:356 +#: ../libvips/conversion/replicate.c:197 ../libvips/conversion/tilecache.c:447 +#: ../libvips/conversion/embed.c:525 ../libvips/conversion/cache.c:107 #: ../libvips/conversion/sequential.c:154 msgid "Input image" msgstr "" @@ -615,10 +617,6 @@ msgstr "" msgid "display unknown" msgstr "" -#: ../libvips/colour/im_rad2float.c:186 -msgid "not a RAD image" -msgstr "" - #: ../libvips/colour/im_icc_transform.c:202 #: ../libvips/colour/im_icc_transform.c:212 #: ../libvips/colour/im_icc_transform.c:1000 @@ -769,7 +767,7 @@ msgstr "" msgid "no input images" msgstr "" -#: ../libvips/conversion/bandary.c:173 +#: ../libvips/conversion/bandary.c:174 msgid "operations on image bands" msgstr "" @@ -778,16 +776,16 @@ msgstr "" msgid "%d underflows and %d overflows detected" msgstr "" -#: ../libvips/conversion/cast.c:472 +#: ../libvips/conversion/cast.c:473 msgid "cast an image" msgstr "" -#: ../libvips/conversion/cast.c:482 ../libvips/conversion/copy.c:352 -#: ../libvips/iofuncs/image.c:879 +#: ../libvips/conversion/cast.c:485 ../libvips/conversion/copy.c:355 +#: ../libvips/iofuncs/image.c:896 msgid "Format" msgstr "" -#: ../libvips/conversion/cast.c:483 +#: ../libvips/conversion/cast.c:486 msgid "Format to cast to" msgstr "" @@ -795,16 +793,16 @@ msgstr "" msgid "conversion operations" msgstr "" -#: ../libvips/conversion/flatten.c:368 +#: ../libvips/conversion/flatten.c:369 msgid "flatten alpha out of an image" msgstr "" -#: ../libvips/conversion/flatten.c:378 ../libvips/conversion/join.c:247 -#: ../libvips/conversion/insert.c:386 +#: ../libvips/conversion/flatten.c:381 ../libvips/conversion/join.c:250 +#: ../libvips/conversion/insert.c:390 msgid "Background" msgstr "" -#: ../libvips/conversion/flatten.c:379 +#: ../libvips/conversion/flatten.c:382 msgid "Background value" msgstr "" @@ -812,14 +810,13 @@ msgstr "" msgid "factors should both be >= 1" msgstr "" -#: ../libvips/conversion/im_subsample.c:221 -#: ../libvips/resample/im_shrink.c:299 +#: ../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:710 +#: ../libvips/iofuncs/sinkscreen.c:1082 ../libvips/iofuncs/image.c:720 #: ../libvips/morphology/im_rank.c:342 msgid "bad parameters" msgstr "" @@ -836,27 +833,27 @@ msgstr "" msgid "extract an area from an image" msgstr "" -#: ../libvips/conversion/extract.c:318 +#: ../libvips/conversion/extract.c:321 msgid "bad extract band" msgstr "" -#: ../libvips/conversion/extract.c:347 +#: ../libvips/conversion/extract.c:350 msgid "extract band from an image" msgstr "" -#: ../libvips/conversion/extract.c:359 +#: ../libvips/conversion/extract.c:362 msgid "Band" msgstr "" -#: ../libvips/conversion/extract.c:360 +#: ../libvips/conversion/extract.c:363 msgid "Band to extract" msgstr "" -#: ../libvips/conversion/extract.c:366 +#: ../libvips/conversion/extract.c:369 msgid "n" msgstr "" -#: ../libvips/conversion/extract.c:367 +#: ../libvips/conversion/extract.c:370 msgid "Number of bands to extract" msgstr "" @@ -873,7 +870,6 @@ msgid "unknown coding" msgstr "" #: ../libvips/conversion/im_msb.c:169 -#: ../libvips/resample/im_rightshift_size.c:116 msgid "bad arguments" msgstr "" @@ -885,93 +881,93 @@ msgstr "" msgid "make a black image" msgstr "" -#: ../libvips/conversion/black.c:129 ../libvips/conversion/copy.c:332 -#: ../libvips/conversion/embed.c:537 ../libvips/foreign/rawload.c:123 -#: ../libvips/iofuncs/image.c:859 +#: ../libvips/conversion/black.c:129 ../libvips/conversion/copy.c:335 +#: ../libvips/conversion/embed.c:545 ../libvips/foreign/rawload.c:123 +#: ../libvips/iofuncs/image.c:876 msgid "Image width in pixels" msgstr "" -#: ../libvips/conversion/black.c:136 ../libvips/conversion/copy.c:339 -#: ../libvips/conversion/embed.c:544 ../libvips/foreign/rawload.c:130 -#: ../libvips/iofuncs/image.c:866 +#: ../libvips/conversion/black.c:136 ../libvips/conversion/copy.c:342 +#: ../libvips/conversion/embed.c:552 ../libvips/foreign/rawload.c:130 +#: ../libvips/iofuncs/image.c:883 msgid "Image height in pixels" msgstr "" -#: ../libvips/conversion/black.c:142 ../libvips/conversion/copy.c:345 -#: ../libvips/foreign/rawload.c:136 ../libvips/iofuncs/image.c:872 +#: ../libvips/conversion/black.c:142 ../libvips/conversion/copy.c:348 +#: ../libvips/foreign/rawload.c:136 ../libvips/iofuncs/image.c:889 msgid "Bands" msgstr "" -#: ../libvips/conversion/black.c:143 ../libvips/conversion/copy.c:346 -#: ../libvips/foreign/rawload.c:137 ../libvips/iofuncs/image.c:873 +#: ../libvips/conversion/black.c:143 ../libvips/conversion/copy.c:349 +#: ../libvips/foreign/rawload.c:137 ../libvips/iofuncs/image.c:890 msgid "Number of bands in image" msgstr "" -#: ../libvips/conversion/copy.c:314 +#: ../libvips/conversion/copy.c:315 msgid "copy an image" msgstr "" -#: ../libvips/conversion/copy.c:324 +#: ../libvips/conversion/copy.c:327 msgid "Swap" msgstr "" -#: ../libvips/conversion/copy.c:325 +#: ../libvips/conversion/copy.c:328 msgid "Swap bytes in image between little and big-endian" msgstr "" -#: ../libvips/conversion/copy.c:353 ../libvips/iofuncs/image.c:880 +#: ../libvips/conversion/copy.c:356 ../libvips/iofuncs/image.c:897 msgid "Pixel format in image" msgstr "" -#: ../libvips/conversion/copy.c:359 ../libvips/iofuncs/image.c:886 +#: ../libvips/conversion/copy.c:362 ../libvips/iofuncs/image.c:903 msgid "Coding" msgstr "" -#: ../libvips/conversion/copy.c:360 ../libvips/iofuncs/image.c:887 +#: ../libvips/conversion/copy.c:363 ../libvips/iofuncs/image.c:904 msgid "Pixel coding" msgstr "" -#: ../libvips/conversion/copy.c:366 ../libvips/iofuncs/image.c:893 +#: ../libvips/conversion/copy.c:369 ../libvips/iofuncs/image.c:910 msgid "Interpretation" msgstr "" -#: ../libvips/conversion/copy.c:367 ../libvips/iofuncs/image.c:894 +#: ../libvips/conversion/copy.c:370 ../libvips/iofuncs/image.c:911 msgid "Pixel interpretation" msgstr "" -#: ../libvips/conversion/copy.c:373 ../libvips/foreign/tiffsave.c:251 -#: ../libvips/iofuncs/image.c:900 +#: ../libvips/conversion/copy.c:376 ../libvips/foreign/tiffsave.c:251 +#: ../libvips/iofuncs/image.c:917 msgid "Xres" msgstr "" -#: ../libvips/conversion/copy.c:374 ../libvips/foreign/tiffsave.c:252 -#: ../libvips/iofuncs/image.c:901 +#: ../libvips/conversion/copy.c:377 ../libvips/foreign/tiffsave.c:252 +#: ../libvips/iofuncs/image.c:918 msgid "Horizontal resolution in pixels/mm" msgstr "" -#: ../libvips/conversion/copy.c:380 ../libvips/foreign/tiffsave.c:258 -#: ../libvips/iofuncs/image.c:907 +#: ../libvips/conversion/copy.c:383 ../libvips/foreign/tiffsave.c:258 +#: ../libvips/iofuncs/image.c:924 msgid "Yres" msgstr "" -#: ../libvips/conversion/copy.c:381 ../libvips/foreign/tiffsave.c:259 -#: ../libvips/iofuncs/image.c:908 +#: ../libvips/conversion/copy.c:384 ../libvips/foreign/tiffsave.c:259 +#: ../libvips/iofuncs/image.c:925 msgid "Vertical resolution in pixels/mm" msgstr "" -#: ../libvips/conversion/copy.c:387 ../libvips/iofuncs/image.c:914 +#: ../libvips/conversion/copy.c:390 ../libvips/iofuncs/image.c:931 msgid "Xoffset" msgstr "" -#: ../libvips/conversion/copy.c:388 ../libvips/iofuncs/image.c:915 +#: ../libvips/conversion/copy.c:391 ../libvips/iofuncs/image.c:932 msgid "Horizontal offset of origin" msgstr "" -#: ../libvips/conversion/copy.c:394 ../libvips/iofuncs/image.c:921 +#: ../libvips/conversion/copy.c:397 ../libvips/iofuncs/image.c:938 msgid "Yoffset" msgstr "" -#: ../libvips/conversion/copy.c:395 ../libvips/iofuncs/image.c:922 +#: ../libvips/conversion/copy.c:398 ../libvips/iofuncs/image.c:939 msgid "Vertical offset of origin" msgstr "" @@ -999,59 +995,59 @@ msgstr "" msgid "Repeat this many times vertically" msgstr "" -#: ../libvips/conversion/join.c:210 +#: ../libvips/conversion/join.c:211 msgid "join a pair of images" msgstr "" -#: ../libvips/conversion/join.c:214 +#: ../libvips/conversion/join.c:217 msgid "in1" msgstr "" -#: ../libvips/conversion/join.c:215 +#: ../libvips/conversion/join.c:218 msgid "First input image" msgstr "" -#: ../libvips/conversion/join.c:220 +#: ../libvips/conversion/join.c:223 msgid "in2" msgstr "" -#: ../libvips/conversion/join.c:221 +#: ../libvips/conversion/join.c:224 msgid "Second input image" msgstr "" -#: ../libvips/conversion/join.c:226 +#: ../libvips/conversion/join.c:229 msgid "direction" msgstr "" -#: ../libvips/conversion/join.c:227 +#: ../libvips/conversion/join.c:230 msgid "Join left-right or up-down" msgstr "" -#: ../libvips/conversion/join.c:233 ../libvips/conversion/insert.c:379 +#: ../libvips/conversion/join.c:236 ../libvips/conversion/insert.c:383 msgid "Expand" msgstr "" -#: ../libvips/conversion/join.c:234 ../libvips/conversion/insert.c:380 +#: ../libvips/conversion/join.c:237 ../libvips/conversion/insert.c:384 msgid "Expand output to hold all of both inputs" msgstr "" -#: ../libvips/conversion/join.c:240 +#: ../libvips/conversion/join.c:243 msgid "Shim" msgstr "" -#: ../libvips/conversion/join.c:241 +#: ../libvips/conversion/join.c:244 msgid "Pixels between images" msgstr "" -#: ../libvips/conversion/join.c:248 ../libvips/conversion/insert.c:387 +#: ../libvips/conversion/join.c:251 ../libvips/conversion/insert.c:391 msgid "Colour for new pixels" msgstr "" -#: ../libvips/conversion/join.c:254 +#: ../libvips/conversion/join.c:257 msgid "Align" msgstr "" -#: ../libvips/conversion/join.c:255 +#: ../libvips/conversion/join.c:258 msgid "Align on the low, centre or high coordinate edge" msgstr "" @@ -1076,75 +1072,75 @@ msgstr "" msgid "insert an image" msgstr "" -#: ../libvips/conversion/insert.c:353 +#: ../libvips/conversion/insert.c:357 msgid "Main" msgstr "" -#: ../libvips/conversion/insert.c:354 +#: ../libvips/conversion/insert.c:358 msgid "Main input image" msgstr "" -#: ../libvips/conversion/insert.c:359 +#: ../libvips/conversion/insert.c:363 msgid "Sub-image" msgstr "" -#: ../libvips/conversion/insert.c:360 +#: ../libvips/conversion/insert.c:364 msgid "Sub-image to insert into main image" msgstr "" -#: ../libvips/conversion/insert.c:365 +#: ../libvips/conversion/insert.c:369 msgid "X" msgstr "" -#: ../libvips/conversion/insert.c:366 +#: ../libvips/conversion/insert.c:370 msgid "Left edge of sub in main" msgstr "" -#: ../libvips/conversion/insert.c:372 +#: ../libvips/conversion/insert.c:376 msgid "Y" msgstr "" -#: ../libvips/conversion/insert.c:373 +#: ../libvips/conversion/insert.c:377 msgid "Top edge of sub in main" msgstr "" -#: ../libvips/conversion/tilecache.c:418 ../libvips/conversion/cache.c:102 +#: ../libvips/conversion/tilecache.c:442 ../libvips/conversion/cache.c:102 msgid "cache an image" msgstr "" -#: ../libvips/conversion/tilecache.c:428 ../libvips/conversion/cache.c:112 -#: ../libvips/foreign/tiffsave.c:215 +#: ../libvips/conversion/tilecache.c:452 ../libvips/conversion/cache.c:112 +#: ../libvips/foreign/tiffsave.c:215 ../libvips/foreign/dzsave.c:747 msgid "Tile width" msgstr "" -#: ../libvips/conversion/tilecache.c:429 ../libvips/conversion/cache.c:113 -#: ../libvips/foreign/tiffsave.c:216 +#: ../libvips/conversion/tilecache.c:453 ../libvips/conversion/cache.c:113 +#: ../libvips/foreign/tiffsave.c:216 ../libvips/foreign/dzsave.c:748 msgid "Tile width in pixels" msgstr "" -#: ../libvips/conversion/tilecache.c:435 ../libvips/conversion/cache.c:119 -#: ../libvips/foreign/tiffsave.c:222 +#: ../libvips/conversion/tilecache.c:459 ../libvips/conversion/cache.c:119 +#: ../libvips/foreign/tiffsave.c:222 ../libvips/foreign/dzsave.c:754 msgid "Tile height" msgstr "" -#: ../libvips/conversion/tilecache.c:436 ../libvips/conversion/cache.c:120 -#: ../libvips/foreign/tiffsave.c:223 +#: ../libvips/conversion/tilecache.c:460 ../libvips/conversion/cache.c:120 +#: ../libvips/foreign/tiffsave.c:223 ../libvips/foreign/dzsave.c:755 msgid "Tile height in pixels" msgstr "" -#: ../libvips/conversion/tilecache.c:442 ../libvips/conversion/cache.c:126 +#: ../libvips/conversion/tilecache.c:466 ../libvips/conversion/cache.c:126 msgid "Max tiles" msgstr "" -#: ../libvips/conversion/tilecache.c:443 ../libvips/conversion/cache.c:127 +#: ../libvips/conversion/tilecache.c:467 ../libvips/conversion/cache.c:127 msgid "Maximum number of tiles to cache" msgstr "" -#: ../libvips/conversion/tilecache.c:449 +#: ../libvips/conversion/tilecache.c:473 msgid "Strategy" msgstr "" -#: ../libvips/conversion/tilecache.c:450 +#: ../libvips/conversion/tilecache.c:474 msgid "Expected access pattern" msgstr "" @@ -1153,63 +1149,63 @@ msgstr "" msgid "command failed: \"%s\"" msgstr "" -#: ../libvips/conversion/embed.c:430 ../libvips/iofuncs/image.c:1790 +#: ../libvips/conversion/embed.c:435 ../libvips/iofuncs/image.c:1863 msgid "bad dimensions" msgstr "" -#: ../libvips/conversion/embed.c:512 +#: ../libvips/conversion/embed.c:518 msgid "embed an image in a larger image" msgstr "" -#: ../libvips/conversion/embed.c:523 +#: ../libvips/conversion/embed.c:531 msgid "Left edge of input in output" msgstr "" -#: ../libvips/conversion/embed.c:530 +#: ../libvips/conversion/embed.c:538 msgid "Top edge of input in output" msgstr "" -#: ../libvips/conversion/embed.c:550 +#: ../libvips/conversion/embed.c:558 msgid "Extend" msgstr "" -#: ../libvips/conversion/embed.c:551 +#: ../libvips/conversion/embed.c:559 msgid "How to generate the extra pixels" msgstr "" -#: ../libvips/conversion/ifthenelse.c:468 +#: ../libvips/conversion/ifthenelse.c:469 msgid "ifthenelse an image" msgstr "" -#: ../libvips/conversion/ifthenelse.c:472 +#: ../libvips/conversion/ifthenelse.c:475 msgid "Condition" msgstr "" -#: ../libvips/conversion/ifthenelse.c:473 +#: ../libvips/conversion/ifthenelse.c:476 msgid "Condition input image" msgstr "" -#: ../libvips/conversion/ifthenelse.c:478 +#: ../libvips/conversion/ifthenelse.c:481 msgid "Then image" msgstr "" -#: ../libvips/conversion/ifthenelse.c:479 +#: ../libvips/conversion/ifthenelse.c:482 msgid "Source for TRUE pixels" msgstr "" -#: ../libvips/conversion/ifthenelse.c:484 +#: ../libvips/conversion/ifthenelse.c:487 msgid "Else image" msgstr "" -#: ../libvips/conversion/ifthenelse.c:485 +#: ../libvips/conversion/ifthenelse.c:488 msgid "Source for FALSE pixels" msgstr "" -#: ../libvips/conversion/ifthenelse.c:490 +#: ../libvips/conversion/ifthenelse.c:493 msgid "blend" msgstr "" -#: ../libvips/conversion/ifthenelse.c:491 +#: ../libvips/conversion/ifthenelse.c:494 msgid "Blend smoothly between then and else parts" msgstr "" @@ -1217,15 +1213,15 @@ msgstr "" msgid "bands in must equal matrix width" msgstr "" -#: ../libvips/conversion/recomb.c:196 +#: ../libvips/conversion/recomb.c:197 msgid "linear recombination with matrix" msgstr "" -#: ../libvips/conversion/recomb.c:206 +#: ../libvips/conversion/recomb.c:209 msgid "M" msgstr "" -#: ../libvips/conversion/recomb.c:207 +#: ../libvips/conversion/recomb.c:210 msgid "matrix of coefficients" msgstr "" @@ -1293,7 +1289,7 @@ msgstr "" #: ../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:166 ../libvips/iofuncs/image.c:928 +#: ../libvips/foreign/pngsave.c:166 ../libvips/iofuncs/image.c:945 msgid "Filename" msgstr "" @@ -1519,6 +1515,43 @@ msgstr "" msgid "Write a bigtiff image" msgstr "" +#: ../libvips/foreign/dzsave.c:208 +#, c-format +msgid "Directory \"%s\" exists" +msgstr "" + +#: ../libvips/foreign/dzsave.c:664 +msgid "overlap must be less than tile width and height" +msgstr "" + +#: ../libvips/foreign/dzsave.c:716 +msgid "save image to deep zoom format" +msgstr "" + +#: ../libvips/foreign/dzsave.c:726 +msgid "Directory name" +msgstr "" + +#: ../libvips/foreign/dzsave.c:727 +msgid "Directory name to save to" +msgstr "" + +#: ../libvips/foreign/dzsave.c:733 +msgid "suffix" +msgstr "" + +#: ../libvips/foreign/dzsave.c:734 +msgid "Filename suffix for tiles" +msgstr "" + +#: ../libvips/foreign/dzsave.c:740 +msgid "Overlap" +msgstr "" + +#: ../libvips/foreign/dzsave.c:741 +msgid "Tile overlap in pixels" +msgstr "" + #: ../libvips/foreign/analyzeload.c:114 msgid "load an Analyze6 image" msgstr "" @@ -1706,11 +1739,11 @@ msgstr "" msgid "load raw data from a file" msgstr "" -#: ../libvips/foreign/rawload.c:143 ../libvips/iofuncs/image.c:956 +#: ../libvips/foreign/rawload.c:143 ../libvips/iofuncs/image.c:973 msgid "Size of header" msgstr "" -#: ../libvips/foreign/rawload.c:144 ../libvips/iofuncs/image.c:957 +#: ../libvips/foreign/rawload.c:144 ../libvips/iofuncs/image.c:974 msgid "Offset in bytes from start of file" msgstr "" @@ -1801,7 +1834,7 @@ msgstr "" msgid "bad page number %d" msgstr "" -#: ../libvips/foreign/tiff2vips.c:1486 ../libvips/foreign/vips2tiff.c:289 +#: ../libvips/foreign/tiff2vips.c:1486 ../libvips/foreign/vips2tiff.c:292 #, c-format msgid "unable to open \"%s\" for input" msgstr "" @@ -1856,8 +1889,8 @@ 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:1181 -#: ../libvips/mosaicing/global_balance.c:1516 +#: ../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 "" @@ -1945,44 +1978,44 @@ msgstr "" msgid "save image to png buffer" msgstr "" -#: ../libvips/foreign/vips2tiff.c:273 +#: ../libvips/foreign/vips2tiff.c:276 #, c-format msgid "unable to open \"%s\" for output" msgstr "" -#: ../libvips/foreign/vips2tiff.c:695 +#: ../libvips/foreign/vips2tiff.c:698 msgid "layer buffer exhausted -- try making TIFF output tiles smaller" msgstr "" -#: ../libvips/foreign/vips2tiff.c:926 +#: ../libvips/foreign/vips2tiff.c:929 msgid "TIFF write tile failed" msgstr "" -#: ../libvips/foreign/vips2tiff.c:1002 +#: ../libvips/foreign/vips2tiff.c:1005 msgid "internal error #9876345" msgstr "" -#: ../libvips/foreign/vips2tiff.c:1255 +#: ../libvips/foreign/vips2tiff.c:1266 msgid "tile size not a multiple of 16" msgstr "" -#: ../libvips/foreign/vips2tiff.c:1261 +#: ../libvips/foreign/vips2tiff.c:1272 msgid "can't have strip pyramid -- enabling tiling" msgstr "" -#: ../libvips/foreign/vips2tiff.c:1272 +#: ../libvips/foreign/vips2tiff.c:1283 msgid "can only pyramid LABQ and non-complex images" msgstr "" -#: ../libvips/foreign/vips2tiff.c:1289 +#: ../libvips/foreign/vips2tiff.c:1300 msgid "can't have 1-bit JPEG -- disabling JPEG" msgstr "" -#: ../libvips/foreign/vips2tiff.c:1479 +#: ../libvips/foreign/vips2tiff.c:1490 msgid "unsigned 8-bit int, 16-bit int, and 32-bit float only" msgstr "" -#: ../libvips/foreign/vips2tiff.c:1486 +#: ../libvips/foreign/vips2tiff.c:1497 msgid "1 to 5 bands only" msgstr "" @@ -1995,7 +2028,7 @@ msgstr "" msgid "file \"%s\" not found" msgstr "" -#: ../libvips/foreign/foreign.c:536 ../libvips/foreign/foreign.c:1030 +#: ../libvips/foreign/foreign.c:536 ../libvips/foreign/foreign.c:1053 #, c-format msgid "\"%s\" is not a known file format" msgstr "" @@ -2004,61 +2037,65 @@ msgstr "" msgid "images do not match" msgstr "" -#: ../libvips/foreign/foreign.c:832 +#: ../libvips/foreign/foreign.c:838 msgid "" "VIPS_FOREIGN_PARTIAL and VIPS_FOREIGN_SEQUENTIAL both set -- using SEQUENTIAL" msgstr "" -#: ../libvips/foreign/foreign.c:900 +#: ../libvips/foreign/foreign.c:921 msgid "file loaders" msgstr "" -#: ../libvips/foreign/foreign.c:909 +#: ../libvips/foreign/foreign.c:932 msgid "Flags" msgstr "" -#: ../libvips/foreign/foreign.c:910 +#: ../libvips/foreign/foreign.c:933 msgid "Flags for this file" msgstr "" -#: ../libvips/foreign/foreign.c:916 +#: ../libvips/foreign/foreign.c:939 msgid "Disc" msgstr "" -#: ../libvips/foreign/foreign.c:917 +#: ../libvips/foreign/foreign.c:940 msgid "Open to disc" msgstr "" -#: ../libvips/foreign/foreign.c:923 +#: ../libvips/foreign/foreign.c:946 msgid "Sequential" msgstr "" -#: ../libvips/foreign/foreign.c:924 +#: ../libvips/foreign/foreign.c:947 msgid "Sequential read only" msgstr "" -#: ../libvips/foreign/foreign.c:1401 +#: ../libvips/foreign/foreign.c:1425 msgid "file savers" msgstr "" -#: ../libvips/foreign/foreign.c:1411 +#: ../libvips/foreign/foreign.c:1439 msgid "Image to save" msgstr "" -#: ../libvips/foreign/vipspng.c:245 +#: ../libvips/foreign/vipspng.c:241 msgid "unsupported color type" msgstr "" -#: ../libvips/foreign/vipspng.c:621 +#: ../libvips/foreign/vipspng.c:351 +msgid "unable to read PNG header" +msgstr "" + +#: ../libvips/foreign/vipspng.c:628 msgid "compress should be in [0,9]" msgstr "" -#: ../libvips/foreign/vipspng.c:714 +#: ../libvips/foreign/vipspng.c:721 #, c-format msgid "unable to write \"%s\"" msgstr "" -#: ../libvips/foreign/vipspng.c:813 +#: ../libvips/foreign/vipspng.c:820 msgid "unable to write to buffer" msgstr "" @@ -2242,30 +2279,30 @@ msgstr "" msgid "output" msgstr "" -#: ../libvips/iofuncs/operation.c:246 +#: ../libvips/iofuncs/operation.c:272 msgid "operations" msgstr "" -#: ../libvips/iofuncs/operation.c:273 +#: ../libvips/iofuncs/operation.c:316 msgid "usage:" msgstr "" -#: ../libvips/iofuncs/operation.c:287 ../libvips/iofuncs/object.c:1239 -#: ../libvips/resample/interpolate.c:615 +#: ../libvips/iofuncs/operation.c:330 ../libvips/iofuncs/object.c:1241 +#: ../libvips/resample/interpolate.c:612 #, c-format msgid "class \"%s\" not found" msgstr "" -#: ../libvips/iofuncs/operation.c:699 +#: ../libvips/iofuncs/operation.c:707 #, c-format msgid "unknown argument '%s'" msgstr "" -#: ../libvips/iofuncs/operation.c:810 +#: ../libvips/iofuncs/operation.c:821 msgid "too few arguments" msgstr "" -#: ../libvips/iofuncs/operation.c:931 +#: ../libvips/iofuncs/operation.c:942 msgid "too many arguments" msgstr "" @@ -2350,7 +2387,7 @@ msgstr "" msgid "unknown band format %d" msgstr "" -#: ../libvips/iofuncs/header.c:611 ../libvips/iofuncs/generate.c:358 +#: ../libvips/iofuncs/header.c:611 ../libvips/iofuncs/generate.c:377 msgid "too many images" msgstr "" @@ -2364,134 +2401,134 @@ msgstr "" msgid "field \"%s\" is of type %s, not %s" msgstr "" -#: ../libvips/iofuncs/image.c:290 +#: ../libvips/iofuncs/image.c:291 msgid "unable to close fd" msgstr "" -#: ../libvips/iofuncs/image.c:370 +#: ../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:400 +#: ../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:528 +#: ../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:541 +#: ../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:558 +#: ../libvips/iofuncs/image.c:559 #, c-format msgid "%s %s: done in %ds \n" msgstr "" -#: ../libvips/iofuncs/image.c:738 +#: ../libvips/iofuncs/image.c:748 #, c-format msgid "unable to open \"%s\", file too short" msgstr "" -#: ../libvips/iofuncs/image.c:748 +#: ../libvips/iofuncs/image.c:758 #, c-format msgid "%s is longer than expected" msgstr "" -#: ../libvips/iofuncs/image.c:765 +#: ../libvips/iofuncs/image.c:775 #, c-format msgid "bad mode \"%s\"" msgstr "" -#: ../libvips/iofuncs/image.c:832 +#: ../libvips/iofuncs/image.c:848 msgid "image class" msgstr "" -#: ../libvips/iofuncs/image.c:929 +#: ../libvips/iofuncs/image.c:946 msgid "Image filename" msgstr "" -#: ../libvips/iofuncs/image.c:935 +#: ../libvips/iofuncs/image.c:952 msgid "Mode" msgstr "" -#: ../libvips/iofuncs/image.c:936 +#: ../libvips/iofuncs/image.c:953 msgid "Open mode" msgstr "" -#: ../libvips/iofuncs/image.c:942 +#: ../libvips/iofuncs/image.c:959 msgid "Kill" msgstr "" -#: ../libvips/iofuncs/image.c:943 +#: ../libvips/iofuncs/image.c:960 msgid "Block evaluation on this image" msgstr "" -#: ../libvips/iofuncs/image.c:949 +#: ../libvips/iofuncs/image.c:966 msgid "Demand style" msgstr "" -#: ../libvips/iofuncs/image.c:950 +#: ../libvips/iofuncs/image.c:967 msgid "Preferred demand style for this image" msgstr "" -#: ../libvips/iofuncs/image.c:963 +#: ../libvips/iofuncs/image.c:980 msgid "Foreign buffer" msgstr "" -#: ../libvips/iofuncs/image.c:964 +#: ../libvips/iofuncs/image.c:981 msgid "Pointer to foreign pixels" msgstr "" -#: ../libvips/iofuncs/image.c:1228 +#: ../libvips/iofuncs/image.c:1288 #, c-format msgid "killed for image \"%s\"" msgstr "" -#: ../libvips/iofuncs/image.c:1828 +#: ../libvips/iofuncs/image.c:1901 msgid "bad image descriptor" msgstr "" -#: ../libvips/iofuncs/image.c:1886 ../libvips/iofuncs/generate.c:697 +#: ../libvips/iofuncs/image.c:1959 ../libvips/iofuncs/generate.c:716 #, c-format msgid "unable to output to a %s image" msgstr "" -#: ../libvips/iofuncs/image.c:1950 +#: ../libvips/iofuncs/image.c:2023 #, c-format msgid "auto-rewind for %s failed" msgstr "" -#: ../libvips/iofuncs/image.c:2006 ../libvips/iofuncs/image.c:2201 -#: ../libvips/iofuncs/image.c:2218 +#: ../libvips/iofuncs/image.c:2079 ../libvips/iofuncs/image.c:2274 +#: ../libvips/iofuncs/image.c:2291 msgid "no image data" msgstr "" -#: ../libvips/iofuncs/image.c:2074 ../libvips/iofuncs/image.c:2241 +#: ../libvips/iofuncs/image.c:2147 ../libvips/iofuncs/image.c:2314 msgid "image not readable" msgstr "" -#: ../libvips/iofuncs/image.c:2095 ../libvips/iofuncs/image.c:2271 -#: ../libvips/iofuncs/image.c:2280 +#: ../libvips/iofuncs/image.c:2168 ../libvips/iofuncs/image.c:2344 +#: ../libvips/iofuncs/image.c:2353 msgid "image already written" msgstr "" -#: ../libvips/iofuncs/image.c:2119 ../libvips/iofuncs/image.c:2292 +#: ../libvips/iofuncs/image.c:2192 ../libvips/iofuncs/image.c:2365 msgid "image not writeable" msgstr "" -#: ../libvips/iofuncs/image.c:2165 +#: ../libvips/iofuncs/image.c:2238 msgid "bad file type" msgstr "" @@ -2560,133 +2597,133 @@ msgstr "" msgid "unix error" msgstr "" -#: ../libvips/iofuncs/error.c:304 ../libvips/iofuncs/error.c:305 -#: ../libvips/iofuncs/error.c:354 ../libvips/iofuncs/error.c:355 +#: ../libvips/iofuncs/error.c:310 ../libvips/iofuncs/error.c:311 +#: ../libvips/iofuncs/error.c:360 ../libvips/iofuncs/error.c:361 #, c-format msgid "%s: " msgstr "" -#: ../libvips/iofuncs/error.c:304 +#: ../libvips/iofuncs/error.c:310 msgid "vips diagnostic" msgstr "" -#: ../libvips/iofuncs/error.c:354 +#: ../libvips/iofuncs/error.c:360 msgid "vips warning" msgstr "" -#: ../libvips/iofuncs/error.c:438 +#: ../libvips/iofuncs/error.c:444 msgid "image must be uncoded" msgstr "" -#: ../libvips/iofuncs/error.c:466 +#: ../libvips/iofuncs/error.c:472 msgid "image coding must be NONE or LABQ" msgstr "" -#: ../libvips/iofuncs/error.c:494 +#: ../libvips/iofuncs/error.c:500 msgid "unknown image coding" msgstr "" -#: ../libvips/iofuncs/error.c:520 +#: ../libvips/iofuncs/error.c:526 msgid "Radiance coding only" msgstr "" -#: ../libvips/iofuncs/error.c:546 +#: ../libvips/iofuncs/error.c:552 msgid "LABQ coding only" msgstr "" -#: ../libvips/iofuncs/error.c:570 +#: ../libvips/iofuncs/error.c:576 msgid "image must one band" msgstr "" -#: ../libvips/iofuncs/error.c:595 +#: ../libvips/iofuncs/error.c:601 #, c-format msgid "image must have %d bands" msgstr "" -#: ../libvips/iofuncs/error.c:620 +#: ../libvips/iofuncs/error.c:626 msgid "image must have one or three bands" msgstr "" -#: ../libvips/iofuncs/error.c:648 +#: ../libvips/iofuncs/error.c:654 msgid "images must have the same number of bands, or one must be single-band" msgstr "" -#: ../libvips/iofuncs/error.c:675 +#: ../libvips/iofuncs/error.c:681 #, c-format msgid "image must have 1 or %d bands" msgstr "" -#: ../libvips/iofuncs/error.c:699 +#: ../libvips/iofuncs/error.c:705 msgid "image must be non-complex" msgstr "" -#: ../libvips/iofuncs/error.c:723 +#: ../libvips/iofuncs/error.c:729 msgid "image must be complex" msgstr "" -#: ../libvips/iofuncs/error.c:749 +#: ../libvips/iofuncs/error.c:755 #, c-format msgid "image must be %s" msgstr "" -#: ../libvips/iofuncs/error.c:774 +#: ../libvips/iofuncs/error.c:780 msgid "image must be integer" msgstr "" -#: ../libvips/iofuncs/error.c:799 +#: ../libvips/iofuncs/error.c:805 msgid "image must be unsigned integer" msgstr "" -#: ../libvips/iofuncs/error.c:827 +#: ../libvips/iofuncs/error.c:833 msgid "image must be 8- or 16-bit integer, signed or unsigned" msgstr "" -#: ../libvips/iofuncs/error.c:854 +#: ../libvips/iofuncs/error.c:860 msgid "image must be 8- or 16-bit unsigned integer" msgstr "" -#: ../libvips/iofuncs/error.c:880 +#: ../libvips/iofuncs/error.c:886 msgid "image must be 8- or 16-bit unsigned integer, or float" msgstr "" -#: ../libvips/iofuncs/error.c:908 +#: ../libvips/iofuncs/error.c:914 msgid "image must be unsigned int or float" msgstr "" -#: ../libvips/iofuncs/error.c:933 +#: ../libvips/iofuncs/error.c:939 msgid "images must match in size" msgstr "" -#: ../libvips/iofuncs/error.c:959 +#: ../libvips/iofuncs/error.c:965 msgid "images must have the same number of bands" msgstr "" -#: ../libvips/iofuncs/error.c:1013 +#: ../libvips/iofuncs/error.c:1019 msgid "images must have the same band format" msgstr "" -#: ../libvips/iofuncs/error.c:1039 +#: ../libvips/iofuncs/error.c:1045 msgid "images must have the same coding" msgstr "" -#: ../libvips/iofuncs/error.c:1064 +#: ../libvips/iofuncs/error.c:1070 #, c-format msgid "vector must have 1 or %d elements" msgstr "" -#: ../libvips/iofuncs/error.c:1089 +#: ../libvips/iofuncs/error.c:1095 msgid "histograms must have width or height 1" msgstr "" -#: ../libvips/iofuncs/error.c:1094 +#: ../libvips/iofuncs/error.c:1100 msgid "histograms must have not have more than 65536 elements" msgstr "" -#: ../libvips/iofuncs/error.c:1123 ../libvips/iofuncs/error.c:1151 +#: ../libvips/iofuncs/error.c:1129 ../libvips/iofuncs/error.c:1157 msgid "nonsense mask parameters" msgstr "" -#: ../libvips/iofuncs/error.c:1176 +#: ../libvips/iofuncs/error.c:1182 msgid "mask must be 1D" msgstr "" @@ -2727,16 +2764,21 @@ msgstr "" msgid "unable to truncate" msgstr "" -#: ../libvips/iofuncs/util.c:1297 +#: ../libvips/iofuncs/util.c:1204 +#, c-format +msgid "unable to create directory \"%s\", %s" +msgstr "" + +#: ../libvips/iofuncs/util.c:1338 msgid "unexpected end of string" msgstr "" -#: ../libvips/iofuncs/util.c:1315 +#: ../libvips/iofuncs/util.c:1356 #, c-format msgid "expected %s, saw %s" msgstr "" -#: ../libvips/iofuncs/util.c:1485 +#: ../libvips/iofuncs/util.c:1526 #, c-format msgid "unable to make temporary file %s" msgstr "" @@ -2781,11 +2823,11 @@ msgstr "" msgid "too much data" msgstr "" -#: ../libvips/iofuncs/generate.c:621 +#: ../libvips/iofuncs/generate.c:640 msgid "demand hint not set" msgstr "" -#: ../libvips/iofuncs/generate.c:640 ../libvips/iofuncs/generate.c:665 +#: ../libvips/iofuncs/generate.c:659 ../libvips/iofuncs/generate.c:684 msgid "generate() called twice" msgstr "" @@ -2841,125 +2883,136 @@ msgstr "" msgid "unable to mmap \"%s\" to same address" msgstr "" -#: ../libvips/iofuncs/init.c:368 +#: ../libvips/iofuncs/init.c:371 msgid "evaluate with N concurrent threads" msgstr "" -#: ../libvips/iofuncs/init.c:371 +#: ../libvips/iofuncs/init.c:374 msgid "set tile width to N (DEBUG)" msgstr "" -#: ../libvips/iofuncs/init.c:374 +#: ../libvips/iofuncs/init.c:377 msgid "set tile height to N (DEBUG)" msgstr "" -#: ../libvips/iofuncs/init.c:377 +#: ../libvips/iofuncs/init.c:380 msgid "set thinstrip height to N (DEBUG)" msgstr "" -#: ../libvips/iofuncs/init.c:380 +#: ../libvips/iofuncs/init.c:383 msgid "set fatstrip height to N (DEBUG)" msgstr "" -#: ../libvips/iofuncs/init.c:383 +#: ../libvips/iofuncs/init.c:386 msgid "show progress feedback" msgstr "" -#: ../libvips/iofuncs/init.c:386 +#: ../libvips/iofuncs/init.c:389 msgid "leak-check on exit" msgstr "" -#: ../libvips/iofuncs/init.c:389 +#: ../libvips/iofuncs/init.c:392 msgid "images larger than N are decompressed to disc" msgstr "" -#: ../libvips/iofuncs/init.c:392 +#: ../libvips/iofuncs/init.c:395 msgid "disable vectorised versions of operations" msgstr "" -#: ../libvips/iofuncs/init.c:395 +#: ../libvips/iofuncs/init.c:398 msgid "cache at most N operations" msgstr "" -#: ../libvips/iofuncs/init.c:398 +#: ../libvips/iofuncs/init.c:401 msgid "cache at most N bytes in memory" msgstr "" -#: ../libvips/iofuncs/init.c:401 +#: ../libvips/iofuncs/init.c:404 msgid "allow at most N open files" msgstr "" -#: ../libvips/iofuncs/init.c:404 +#: ../libvips/iofuncs/init.c:407 msgid "trace operation cache" msgstr "" -#: ../libvips/iofuncs/init.c:407 +#: ../libvips/iofuncs/init.c:410 msgid "dump operation cache on exit" msgstr "" -#: ../libvips/iofuncs/init.c:430 +#: ../libvips/iofuncs/init.c:433 msgid "VIPS Options" msgstr "" -#: ../libvips/iofuncs/init.c:430 +#: ../libvips/iofuncs/init.c:433 msgid "Show VIPS options" msgstr "" -#: ../libvips/iofuncs/object.c:148 +#: ../libvips/iofuncs/object.c:150 #, c-format msgid "parameter %s not set" msgstr "" -#: ../libvips/iofuncs/object.c:500 +#: ../libvips/iofuncs/object.c:502 #, c-format msgid "no property named `%s'" msgstr "" -#: ../libvips/iofuncs/object.c:508 +#: ../libvips/iofuncs/object.c:510 #, c-format msgid "no vips argument named `%s'" msgstr "" -#: ../libvips/iofuncs/object.c:515 +#: ../libvips/iofuncs/object.c:517 #, c-format msgid "argument `%s' has no instance" msgstr "" -#: ../libvips/iofuncs/object.c:1288 +#: ../libvips/iofuncs/object.c:1290 msgid "base class" msgstr "" -#: ../libvips/iofuncs/object.c:1302 +#: ../libvips/iofuncs/object.c:1304 msgid "Nickname" msgstr "" -#: ../libvips/iofuncs/object.c:1303 +#: ../libvips/iofuncs/object.c:1305 msgid "Class nickname" msgstr "" -#: ../libvips/iofuncs/object.c:1309 +#: ../libvips/iofuncs/object.c:1311 msgid "Description" msgstr "" -#: ../libvips/iofuncs/object.c:1310 +#: ../libvips/iofuncs/object.c:1312 msgid "Class description" msgstr "" -#: ../libvips/iofuncs/object.c:1537 +#: ../libvips/iofuncs/object.c:1540 ../libvips/iofuncs/object.c:1554 +#: ../libvips/iofuncs/object.c:1597 +#, c-format +msgid "'%s' is not an integer" +msgstr "" + +#: ../libvips/iofuncs/object.c:1566 +#, c-format +msgid "'%s' is not a double" +msgstr "" + +#: ../libvips/iofuncs/object.c:1581 #, c-format msgid "enum '%s' has no member '%s'" msgstr "" -#: ../libvips/iofuncs/object.c:1797 +#: ../libvips/iofuncs/object.c:1927 #, c-format msgid "unable to set '%s'" msgstr "" -#: ../libvips/iofuncs/object.c:1805 +#: ../libvips/iofuncs/object.c:1935 msgid "not , or ) after parameter" msgstr "" -#: ../libvips/iofuncs/object.c:1812 +#: ../libvips/iofuncs/object.c:1942 msgid "extra tokens after ')'" msgstr "" @@ -3053,47 +3106,47 @@ msgstr "" msgid "too much overlap" msgstr "" -#: ../libvips/mosaicing/global_balance.c:145 +#: ../libvips/mosaicing/global_balance.c:147 msgid "no matching '>'" msgstr "" -#: ../libvips/mosaicing/global_balance.c:154 +#: ../libvips/mosaicing/global_balance.c:156 msgid "too many items" msgstr "" -#: ../libvips/mosaicing/global_balance.c:448 +#: ../libvips/mosaicing/global_balance.c:450 msgid "circularity detected" msgstr "" -#: ../libvips/mosaicing/global_balance.c:482 -#: ../libvips/mosaicing/global_balance.c:538 +#: ../libvips/mosaicing/global_balance.c:484 +#: ../libvips/mosaicing/global_balance.c:540 #, c-format msgid "image \"%s\" used twice as output" msgstr "" -#: ../libvips/mosaicing/global_balance.c:587 +#: ../libvips/mosaicing/global_balance.c:589 msgid "bad number of args in join line" msgstr "" -#: ../libvips/mosaicing/global_balance.c:629 +#: ../libvips/mosaicing/global_balance.c:631 msgid "bad number of args in join1 line" msgstr "" -#: ../libvips/mosaicing/global_balance.c:665 +#: ../libvips/mosaicing/global_balance.c:667 msgid "bad number of args in copy line" msgstr "" -#: ../libvips/mosaicing/global_balance.c:723 +#: ../libvips/mosaicing/global_balance.c:725 msgid "" "mosaic root not found in desc file\n" "is this really a mosaiced image?" msgstr "" -#: ../libvips/mosaicing/global_balance.c:734 +#: ../libvips/mosaicing/global_balance.c:736 msgid "more than one root" msgstr "" -#: ../libvips/mosaicing/global_balance.c:1053 +#: ../libvips/mosaicing/global_balance.c:1055 msgid "empty overlap!" msgstr "" @@ -3156,35 +3209,51 @@ msgstr "" msgid "factor should be in [1,0)" msgstr "" -#: ../libvips/resample/im_shrink.c:359 +#: ../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/im_rightshift_size.c:120 -msgid "shift by zero: falling back to im_copy" -msgstr "" - -#: ../libvips/resample/im_rightshift_size.c:124 -msgid "would result in zero size output image" -msgstr "" - -#: ../libvips/resample/im_rightshift_size.c:132 -msgid "image and band_fmt must match in sign" -msgstr "" - #: ../libvips/resample/interpolate.c:180 msgid "VIPS interpolators" msgstr "" -#: ../libvips/resample/interpolate.c:361 +#: ../libvips/resample/interpolate.c:358 msgid "Nearest-neighbour interpolation" msgstr "" -#: ../libvips/resample/interpolate.c:532 +#: ../libvips/resample/interpolate.c:529 msgid "Bilinear interpolation" msgstr "" @@ -3436,55 +3505,59 @@ msgstr "" msgid "unknown action \"%s\"" msgstr "" -#: ../tools/vipsthumbnail.c:56 +#: ../tools/vipsthumbnail.c:61 msgid "set thumbnail size to SIZE" msgstr "" -#: ../tools/vipsthumbnail.c:57 +#: ../tools/vipsthumbnail.c:62 msgid "SIZE" msgstr "" -#: ../tools/vipsthumbnail.c:59 +#: ../tools/vipsthumbnail.c:64 msgid "set output to FORMAT" msgstr "" -#: ../tools/vipsthumbnail.c:60 +#: ../tools/vipsthumbnail.c:65 msgid "FORMAT" msgstr "" -#: ../tools/vipsthumbnail.c:62 +#: ../tools/vipsthumbnail.c:67 msgid "resample with INTERPOLATOR" msgstr "" -#: ../tools/vipsthumbnail.c:63 +#: ../tools/vipsthumbnail.c:68 msgid "INTERPOLATOR" msgstr "" -#: ../tools/vipsthumbnail.c:65 +#: ../tools/vipsthumbnail.c:70 msgid "don't sharpen thumbnail" msgstr "" -#: ../tools/vipsthumbnail.c:67 +#: ../tools/vipsthumbnail.c:72 msgid "export with PROFILE" msgstr "" -#: ../tools/vipsthumbnail.c:68 ../tools/vipsthumbnail.c:71 +#: ../tools/vipsthumbnail.c:73 ../tools/vipsthumbnail.c:76 msgid "PROFILE" msgstr "" -#: ../tools/vipsthumbnail.c:70 +#: ../tools/vipsthumbnail.c:75 msgid "import untagged images with PROFILE" msgstr "" -#: ../tools/vipsthumbnail.c:73 -msgid "don't delete profile from exported image" +#: ../tools/vipsthumbnail.c:78 +msgid "delete profile from exported image" msgstr "" -#: ../tools/vipsthumbnail.c:75 +#: ../tools/vipsthumbnail.c:80 +msgid "(deprecated, does nothing)" +msgstr "" + +#: ../tools/vipsthumbnail.c:82 msgid "verbose output" msgstr "" -#: ../tools/vipsthumbnail.c:416 +#: ../tools/vipsthumbnail.c:423 msgid "- thumbnail generator" msgstr ""