sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/7.32' 

Conflicts:
	ChangeLog
	configure.ac
	po/vips7.32.pot
This commit is contained in:
John Cupitt 2013-04-16 17:01:37 +01:00
parent 5e30107d75 4c5772fe5f
commit 891051abbe
8 changed files with 2707 additions and 2385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
12/3/13 started 7.33.0
16/4/13 started 7.32.3
- rename GETTEXT_PACKAGE as vips7.32 to help Debian (thanks Jay)
12/3/13 started 7.32.2
- removed some left-over debugging code from configure.ac
- better handling of args without values, thanks Ruven

6
configure.ac
View File

@ -259,7 +259,11 @@ AC_DEFINE_UNQUOTED(VIPS_PREFIX,"$prefix",[configure-time install prefix])
AC_DEFINE_UNQUOTED(VIPS_LIBDIR,"$VIPS_LIBDIR",[configure-time library directory])
# i18n
GETTEXT_PACKAGE=vips7
# we need to name our .mo with major.minor so we can have multiple versions
# installed in parallel on Debian
expand vips$VIPS_MAJOR_VERSION.$VIPS_MINOR_VERSION
GETTEXT_PACKAGE=$expanded_value
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The prefix for our gettext translation domains.])

2
libvips/arithmetic/measure.c
View File

@ -191,7 +191,7 @@ vips_measure_class_init( VipsMeasureClass *class )
object_class->nickname = "measure";
object_class->description =
_( "measure a set of patches on a colour chart" );
_( "measure a set of patches on a color chart" );
object_class->build = vips_measure_build;
VIPS_ARG_IMAGE( class, "in", 1,

54
po/POTFILES.in
View File

@ -255,7 +255,59 @@ tools/header.c
tools/mergeup.c
tools/vips.c
tools/vipsthumbnail.c
libvips/cimg/cimg.cpp
libvipsCC/VDisplay.cc
libvipsCC/VError.cc
libvipsCC/VImage.cc
libvipsCC/vipsc++.cc
libvipsCC/VMask.cc
libvips/include/vips/mosaicing.h
libvips/include/vips/semaphore.h
libvips/include/vips/freq_filt.h
libvips/include/vips/cimg_funcs.h
libvips/include/vips/operation.h
libvips/include/vips/vips.h
libvips/include/vips/memory.h
libvips/include/vips/buf.h
libvips/include/vips/dispatch.h
libvips/include/vips/vips7compat.h
libvips/include/vips/conversion.h
libvips/include/vips/basic.h
libvips/include/vips/inplace.h
libvips/include/vips/relational.h
libvips/include/vips/mask.h
libvips/include/vips/rect.h
libvips/include/vips/generate.h
libvips/include/vips/arithmetic.h
libvips/include/vips/version.h
libvips/include/vips/util.h
libvips/include/vips/almostdeprecated.h
libvips/include/vips/colour.h
libvips/include/vips/threadpool.h
libvips/include/vips/vector.h
libvips/include/vips/morphology.h
libvips/include/vips/error.h
libvips/include/vips/transform.h
libvips/include/vips/region.h
libvips/include/vips/header.h
libvips/include/vips/image.h
libvips/include/vips/intl.h
libvips/include/vips/video.h
libvips/include/vips/enumtypes.h
libvips/include/vips/thread.h
libvips/include/vips/convolution.h
libvips/include/vips/debug.h
libvips/include/vips/interpolate.h
libvips/include/vips/private.h
libvips/include/vips/format.h
libvips/include/vips/object.h
libvips/include/vips/deprecated.h
libvips/include/vips/inlines.h
libvips/include/vips/histograms_lut.h
libvips/include/vips/other.h
libvips/include/vips/foreign.h
libvips/include/vips/resample.h
libvips/include/vips/internal.h
libvips/include/vips/type.h
libvips/resample/vsqbs.cpp
libvips/resample/nohalo.cpp
libvips/resample/lbb.cpp

4
po/README
View File

@ -34,7 +34,7 @@ find */* -name "*.cpp" >> po/POTFILES.in
intltool-update --pot
make a new vips7.pot translation template from the sources
make a new vips7.32.pot translation template from the sources
:%s/msgstr ""/msgstr "Malkovich"/
:%s/msgstr\[0\] ""/msgstr[0] "Malkovich"/
@ -57,7 +57,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
edits to make vips7.pot into test.po
edits to make vips7.32.pot into test.po
msgfmt -cv -o /dev/null test.po

BIN
po/en_GB.gmo
View File

Binary file not shown.

4853
po/en_GB.po
View File

File diff suppressed because it is too large Load Diff

170
po/vips7.pot → po/vips7.32.pot
View File

@ -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: 2013-03-11 12:10+0000\n"
"POT-Creation-Date: 2013-04-16 14:14+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -68,7 +68,7 @@ msgid "patch %d x %d, band %d: avg = %g, sdev = %g"
msgstr ""
#: ../libvips/arithmetic/measure.c:194
msgid "measure a set of patches on a colour chart"
msgid "measure a set of patches on a color chart"
msgstr ""
#: ../libvips/arithmetic/measure.c:198
@ -119,7 +119,7 @@ msgstr ""
#: ../libvips/arithmetic/measure.c:238 ../libvips/conversion/extract.c:220
#: ../libvips/conversion/black.c:129 ../libvips/conversion/copy.c:335
#: ../libvips/conversion/embed.c:571 ../libvips/foreign/rawload.c:123
#: ../libvips/iofuncs/image.c:889
#: ../libvips/iofuncs/image.c:891
msgid "Width"
msgstr ""
@ -130,7 +130,7 @@ msgstr ""
#: ../libvips/arithmetic/measure.c:245 ../libvips/conversion/extract.c:227
#: ../libvips/conversion/black.c:136 ../libvips/conversion/copy.c:342
#: ../libvips/conversion/embed.c:578 ../libvips/foreign/rawload.c:130
#: ../libvips/iofuncs/image.c:896
#: ../libvips/iofuncs/image.c:898
msgid "Height"
msgstr ""
@ -725,7 +725,7 @@ msgid "cast an image"
msgstr ""
#: ../libvips/conversion/cast.c:489 ../libvips/conversion/copy.c:356
#: ../libvips/iofuncs/image.c:910
#: ../libvips/iofuncs/image.c:912
msgid "Format"
msgstr ""
@ -755,13 +755,13 @@ msgstr ""
msgid "factors should both be >= 1"
msgstr ""
#: ../libvips/conversion/im_subsample.c:222 ../libvips/resample/shrink.c:352
#: ../libvips/conversion/im_subsample.c:222 ../libvips/resample/shrink.c:354
msgid "image has shrunk to nothing"
msgstr ""
#: ../libvips/conversion/im_grid.c:165
#: ../libvips/convolution/im_contrast_surface.c:141
#: ../libvips/iofuncs/sinkscreen.c:1063 ../libvips/iofuncs/image.c:734
#: ../libvips/iofuncs/sinkscreen.c:1063 ../libvips/iofuncs/image.c:736
#: ../libvips/morphology/im_rank.c:343
msgid "bad parameters"
msgstr ""
@ -828,23 +828,23 @@ msgstr ""
#: ../libvips/conversion/black.c:130 ../libvips/conversion/copy.c:336
#: ../libvips/conversion/embed.c:572 ../libvips/foreign/rawload.c:124
#: ../libvips/iofuncs/image.c:890
#: ../libvips/iofuncs/image.c:892
msgid "Image width in pixels"
msgstr ""
#: ../libvips/conversion/black.c:137 ../libvips/conversion/copy.c:343
#: ../libvips/conversion/embed.c:579 ../libvips/foreign/rawload.c:131
#: ../libvips/iofuncs/image.c:897
#: ../libvips/iofuncs/image.c:899
msgid "Image height in pixels"
msgstr ""
#: ../libvips/conversion/black.c:143 ../libvips/conversion/copy.c:349
#: ../libvips/foreign/rawload.c:137 ../libvips/iofuncs/image.c:903
#: ../libvips/foreign/rawload.c:137 ../libvips/iofuncs/image.c:905
msgid "Bands"
msgstr ""
#: ../libvips/conversion/black.c:144 ../libvips/conversion/copy.c:350
#: ../libvips/foreign/rawload.c:138 ../libvips/iofuncs/image.c:904
#: ../libvips/foreign/rawload.c:138 ../libvips/iofuncs/image.c:906
msgid "Number of bands in image"
msgstr ""
@ -869,59 +869,59 @@ msgstr ""
msgid "Swap bytes in image between little and big-endian"
msgstr ""
#: ../libvips/conversion/copy.c:357 ../libvips/iofuncs/image.c:911
#: ../libvips/conversion/copy.c:357 ../libvips/iofuncs/image.c:913
msgid "Pixel format in image"
msgstr ""
#: ../libvips/conversion/copy.c:363 ../libvips/iofuncs/image.c:917
#: ../libvips/conversion/copy.c:363 ../libvips/iofuncs/image.c:919
msgid "Coding"
msgstr ""
#: ../libvips/conversion/copy.c:364 ../libvips/iofuncs/image.c:918
#: ../libvips/conversion/copy.c:364 ../libvips/iofuncs/image.c:920
msgid "Pixel coding"
msgstr ""
#: ../libvips/conversion/copy.c:370 ../libvips/iofuncs/image.c:924
#: ../libvips/conversion/copy.c:370 ../libvips/iofuncs/image.c:926
msgid "Interpretation"
msgstr ""
#: ../libvips/conversion/copy.c:371 ../libvips/iofuncs/image.c:925
#: ../libvips/conversion/copy.c:371 ../libvips/iofuncs/image.c:927
msgid "Pixel interpretation"
msgstr ""
#: ../libvips/conversion/copy.c:377 ../libvips/foreign/tiffsave.c:252
#: ../libvips/iofuncs/image.c:931
#: ../libvips/iofuncs/image.c:933
msgid "Xres"
msgstr ""
#: ../libvips/conversion/copy.c:378 ../libvips/foreign/tiffsave.c:253
#: ../libvips/iofuncs/image.c:932
#: ../libvips/iofuncs/image.c:934
msgid "Horizontal resolution in pixels/mm"
msgstr ""
#: ../libvips/conversion/copy.c:384 ../libvips/foreign/tiffsave.c:259
#: ../libvips/iofuncs/image.c:938
#: ../libvips/iofuncs/image.c:940
msgid "Yres"
msgstr ""
#: ../libvips/conversion/copy.c:385 ../libvips/foreign/tiffsave.c:260
#: ../libvips/iofuncs/image.c:939
#: ../libvips/iofuncs/image.c:941
msgid "Vertical resolution in pixels/mm"
msgstr ""
#: ../libvips/conversion/copy.c:391 ../libvips/iofuncs/image.c:945
#: ../libvips/conversion/copy.c:391 ../libvips/iofuncs/image.c:947
msgid "Xoffset"
msgstr ""
#: ../libvips/conversion/copy.c:392 ../libvips/iofuncs/image.c:946
#: ../libvips/conversion/copy.c:392 ../libvips/iofuncs/image.c:948
msgid "Horizontal offset of origin"
msgstr ""
#: ../libvips/conversion/copy.c:398 ../libvips/iofuncs/image.c:952
#: ../libvips/conversion/copy.c:398 ../libvips/iofuncs/image.c:954
msgid "Yoffset"
msgstr ""
#: ../libvips/conversion/copy.c:399 ../libvips/iofuncs/image.c:953
#: ../libvips/conversion/copy.c:399 ../libvips/iofuncs/image.c:955
msgid "Vertical offset of origin"
msgstr ""
@ -1126,7 +1126,7 @@ msgstr ""
msgid "command failed: \"%s\""
msgstr ""
#: ../libvips/conversion/embed.c:462 ../libvips/iofuncs/image.c:1877
#: ../libvips/conversion/embed.c:462 ../libvips/iofuncs/image.c:1879
msgid "bad dimensions"
msgstr ""
@ -1272,7 +1272,7 @@ msgstr ""
#: ../libvips/foreign/jpegload.c:246 ../libvips/foreign/rawload.c:116
#: ../libvips/foreign/matload.c:129 ../libvips/foreign/fitssave.c:129
#: ../libvips/foreign/radsave.c:120 ../libvips/foreign/vipssave.c:123
#: ../libvips/foreign/pngsave.c:169 ../libvips/iofuncs/image.c:959
#: ../libvips/foreign/pngsave.c:169 ../libvips/iofuncs/image.c:961
msgid "Filename"
msgstr ""
@ -1754,11 +1754,11 @@ msgstr ""
msgid "load raw data from a file"
msgstr ""
#: ../libvips/foreign/rawload.c:144 ../libvips/iofuncs/image.c:987
#: ../libvips/foreign/rawload.c:144 ../libvips/iofuncs/image.c:989
msgid "Size of header"
msgstr ""
#: ../libvips/foreign/rawload.c:145 ../libvips/iofuncs/image.c:988
#: ../libvips/foreign/rawload.c:145 ../libvips/iofuncs/image.c:990
msgid "Offset in bytes from start of file"
msgstr ""
@ -2102,20 +2102,20 @@ msgstr ""
msgid "unsupported color type"
msgstr ""
#: ../libvips/foreign/vipspng.c:354
#: ../libvips/foreign/vipspng.c:355
msgid "unable to read PNG header"
msgstr ""
#: ../libvips/foreign/vipspng.c:646
#: ../libvips/foreign/vipspng.c:647
msgid "compress should be in [0,9]"
msgstr ""
#: ../libvips/foreign/vipspng.c:753
#: ../libvips/foreign/vipspng.c:754
#, c-format
msgid "unable to write \"%s\""
msgstr ""
#: ../libvips/foreign/vipspng.c:856
#: ../libvips/foreign/vipspng.c:857
msgid "unable to write to buffer"
msgstr ""
@ -2394,7 +2394,7 @@ msgstr ""
msgid "unknown band format %d"
msgstr ""
#: ../libvips/iofuncs/header.c:751 ../libvips/iofuncs/generate.c:378
#: ../libvips/iofuncs/header.c:751 ../libvips/iofuncs/generate.c:379
msgid "too many images"
msgstr ""
@ -2428,114 +2428,114 @@ msgstr[1] ""
#: ../libvips/iofuncs/image.c:542
#, c-format
msgid "%s %s: %d threads, %d x %d tiles, groups of %d scanlines"
msgid "%s %s: %d x %d pixels, %d threads, %d x %d tiles, %d lines in buffer"
msgstr ""
#: ../libvips/iofuncs/image.c:555
#: ../libvips/iofuncs/image.c:557
#, c-format
msgid "%s %s: %d%% complete"
msgstr ""
#. Spaces at end help to erase the %complete message we overwrite.
#.
#: ../libvips/iofuncs/image.c:572
#: ../libvips/iofuncs/image.c:574
#, c-format
msgid "%s %s: done in %.3gs \n"
msgstr ""
#: ../libvips/iofuncs/image.c:762
#: ../libvips/iofuncs/image.c:764
#, c-format
msgid "unable to open \"%s\", file too short"
msgstr ""
#: ../libvips/iofuncs/image.c:772
#: ../libvips/iofuncs/image.c:774
#, c-format
msgid "%s is longer than expected"
msgstr ""
#: ../libvips/iofuncs/image.c:789
#: ../libvips/iofuncs/image.c:791
#, c-format
msgid "bad mode \"%s\""
msgstr ""
#: ../libvips/iofuncs/image.c:862
#: ../libvips/iofuncs/image.c:864
msgid "image class"
msgstr ""
#: ../libvips/iofuncs/image.c:960
#: ../libvips/iofuncs/image.c:962
msgid "Image filename"
msgstr ""
#: ../libvips/iofuncs/image.c:966
#: ../libvips/iofuncs/image.c:968
msgid "Mode"
msgstr ""
#: ../libvips/iofuncs/image.c:967
#: ../libvips/iofuncs/image.c:969
msgid "Open mode"
msgstr ""
#: ../libvips/iofuncs/image.c:973
#: ../libvips/iofuncs/image.c:975
msgid "Kill"
msgstr ""
#: ../libvips/iofuncs/image.c:974
#: ../libvips/iofuncs/image.c:976
msgid "Block evaluation on this image"
msgstr ""
#: ../libvips/iofuncs/image.c:980
#: ../libvips/iofuncs/image.c:982
msgid "Demand style"
msgstr ""
#: ../libvips/iofuncs/image.c:981
#: ../libvips/iofuncs/image.c:983
msgid "Preferred demand style for this image"
msgstr ""
#: ../libvips/iofuncs/image.c:994
#: ../libvips/iofuncs/image.c:996
msgid "Foreign buffer"
msgstr ""
#: ../libvips/iofuncs/image.c:995
#: ../libvips/iofuncs/image.c:997
msgid "Pointer to foreign pixels"
msgstr ""
#: ../libvips/iofuncs/image.c:1302
#: ../libvips/iofuncs/image.c:1304
#, c-format
msgid "killed for image \"%s\""
msgstr ""
#: ../libvips/iofuncs/image.c:1915
#: ../libvips/iofuncs/image.c:1917
msgid "bad image descriptor"
msgstr ""
#: ../libvips/iofuncs/image.c:1973 ../libvips/iofuncs/generate.c:718
#: ../libvips/iofuncs/image.c:1975 ../libvips/iofuncs/generate.c:719
#, c-format
msgid "unable to output to a %s image"
msgstr ""
#: ../libvips/iofuncs/image.c:2037
#: ../libvips/iofuncs/image.c:2039
#, c-format
msgid "auto-rewind for %s failed"
msgstr ""
#: ../libvips/iofuncs/image.c:2093 ../libvips/iofuncs/image.c:2289
#: ../libvips/iofuncs/image.c:2306
#: ../libvips/iofuncs/image.c:2095 ../libvips/iofuncs/image.c:2291
#: ../libvips/iofuncs/image.c:2308
msgid "no image data"
msgstr ""
#: ../libvips/iofuncs/image.c:2161 ../libvips/iofuncs/image.c:2329
#: ../libvips/iofuncs/image.c:2163 ../libvips/iofuncs/image.c:2331
msgid "image not readable"
msgstr ""
#: ../libvips/iofuncs/image.c:2182 ../libvips/iofuncs/image.c:2359
#: ../libvips/iofuncs/image.c:2368
#: ../libvips/iofuncs/image.c:2184 ../libvips/iofuncs/image.c:2361
#: ../libvips/iofuncs/image.c:2370
msgid "image already written"
msgstr ""
#: ../libvips/iofuncs/image.c:2206 ../libvips/iofuncs/image.c:2380
#: ../libvips/iofuncs/image.c:2208 ../libvips/iofuncs/image.c:2382
msgid "image not writeable"
msgstr ""
#: ../libvips/iofuncs/image.c:2253
#: ../libvips/iofuncs/image.c:2255
msgid "bad file type"
msgstr ""
@ -2835,21 +2835,21 @@ msgstr ""
msgid "TB"
msgstr ""
#: ../libvips/iofuncs/base64.c:168
#: ../libvips/iofuncs/base64.c:169
msgid "too little data"
msgstr ""
#. We shouldn't really be used for large amounts of data.
#.
#: ../libvips/iofuncs/base64.c:174 ../libvips/iofuncs/base64.c:239
#: ../libvips/iofuncs/base64.c:175 ../libvips/iofuncs/base64.c:240
msgid "too much data"
msgstr ""
#: ../libvips/iofuncs/generate.c:642
#: ../libvips/iofuncs/generate.c:643
msgid "demand hint not set"
msgstr ""
#: ../libvips/iofuncs/generate.c:661 ../libvips/iofuncs/generate.c:686
#: ../libvips/iofuncs/generate.c:662 ../libvips/iofuncs/generate.c:687
msgid "generate() called twice"
msgstr ""
@ -3022,27 +3022,37 @@ msgstr ""
msgid "enum '%s' has no member '%s', should be one of: %s"
msgstr ""
#: ../libvips/iofuncs/object.c:1565 ../libvips/iofuncs/object.c:1579
#: ../libvips/iofuncs/object.c:1620
#: ../libvips/iofuncs/object.c:1480
#, c-format
msgid "no value supplied for argument '%s'"
msgstr ""
#: ../libvips/iofuncs/object.c:1483
#, c-format
msgid "no value supplied for argument '%s' ('%s')"
msgstr ""
#: ../libvips/iofuncs/object.c:1603 ../libvips/iofuncs/object.c:1622
#: ../libvips/iofuncs/object.c:1678
#, c-format
msgid "'%s' is not an integer"
msgstr ""
#: ../libvips/iofuncs/object.c:1591
#: ../libvips/iofuncs/object.c:1639
#, c-format
msgid "'%s' is not a double"
msgstr ""
#: ../libvips/iofuncs/object.c:1950
#: ../libvips/iofuncs/object.c:2013
#, c-format
msgid "unable to set '%s'"
msgstr ""
#: ../libvips/iofuncs/object.c:1958
#: ../libvips/iofuncs/object.c:2021
msgid "not , or ) after parameter"
msgstr ""
#: ../libvips/iofuncs/object.c:1965
#: ../libvips/iofuncs/object.c:2028
msgid "extra tokens after ')'"
msgstr ""
@ -3270,31 +3280,31 @@ msgstr ""
msgid "Interpolate values with this"
msgstr ""
#: ../libvips/resample/shrink.c:317
#: ../libvips/resample/shrink.c:319
msgid "shrink factors should be >= 1"
msgstr ""
#: ../libvips/resample/shrink.c:324
#: ../libvips/resample/shrink.c:326
msgid "not integer shrink factors, expect poor results"
msgstr ""
#: ../libvips/resample/shrink.c:385
#: ../libvips/resample/shrink.c:387
msgid "shrink an image"
msgstr ""
#: ../libvips/resample/shrink.c:391
#: ../libvips/resample/shrink.c:393
msgid "Xshrink"
msgstr ""
#: ../libvips/resample/shrink.c:392
#: ../libvips/resample/shrink.c:394
msgid "Horizontal shrink factor"
msgstr ""
#: ../libvips/resample/shrink.c:398
#: ../libvips/resample/shrink.c:400
msgid "Yshrink"
msgstr ""
#: ../libvips/resample/shrink.c:399
#: ../libvips/resample/shrink.c:401
msgid "Vertical shrink factor"
msgstr ""
@ -3605,8 +3615,8 @@ msgstr ""
msgid "possible actions:\n"
msgstr ""
#: ../tools/vips.c:964
msgid "execute vips operation OP"
#: ../tools/vips.c:961
msgid "execute vips operation OPER"
msgstr ""
#: ../tools/vips.c:1013
@ -3617,7 +3627,7 @@ msgstr ""
msgid "[ACTION] [OPTIONS] [PARAMETERS] - VIPS driver program"
msgstr ""
#: ../tools/vips.c:1212
#: ../tools/vips.c:1206
#, c-format
msgid "unknown action \"%s\""
msgstr ""